From e9770b9c5b108ada1289476e6c85a3c058e5d250 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 4 Jul 2026 10:52:38 +0200 Subject: [PATCH] package/samba4: fix build on m68k samba4 uses very big switch statements, which causes the build to fail on m68k, because the offsets there are only 16-bit. We fix that by using -mlong-jump-table-offsets on m68k to use 32-bit offsets for switch statements, but this is only available starting with gcc 7 [0] [1]. Only one package selects samba4, mpd, but it already depends on gcc >= 12. As such, we do not need to propagate that new dependency. Fixes: https://autobuild.buildroot.net/results/b60/b606da691bb462879d4f9769928b5a40b9170837/ [0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57583#c15 [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57583#c16 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain (cherry picked from commit 053615b6a769826ff77dd0ccb1bef08a12943fdc) Signed-off-by: Thomas Perale --- package/samba4/Config.in | 5 +++++ package/samba4/samba4.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/package/samba4/Config.in b/package/samba4/Config.in index e1d3dd9bf7..59f040e96a 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -4,6 +4,10 @@ comment "samba4 needs a uClibc or glibc toolchain w/ wchar, dynamic library, NPT || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU +comment "samba4 needs a toolchain w/ gcc >= 7" + depends on BR2_m68k + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + config BR2_PACKAGE_SAMBA4 bool "samba4" depends on BR2_USE_MMU # fork() @@ -12,6 +16,7 @@ config BR2_PACKAGE_SAMBA4 depends on !BR2_STATIC_LIBS # cmocka, python, gnutls depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x select BR2_PACKAGE_CMOCKA select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_GNUTLS diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 2d6bc80b9e..006fbff6c5 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -32,6 +32,11 @@ SAMBA4_CONF_ENV = \ XSLTPROC=false \ WAF_NO_PREFORK=1 +# m68k needs 32-bit offsets in switch tables to build +ifeq ($(BR2_m68k),y) +SAMBA4_CFLAGS += -mlong-jump-table-offsets +endif + SAMBA4_PYTHON = PYTHON="$(HOST_DIR)/bin/python3" ifeq ($(BR2_PACKAGE_PYTHON3),y) SAMBA4_PYTHON += PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config"