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 e96e86b5f3..50ae8ba6af 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"