samba4: fix compiling bundled Kerberos

Fix compiling bundled Kerberos library on several 32-bit architectures
by linking with libatomic.

Disable kernel keyring being picked up from a dirty buildbot
environment.

Signed-off-by: George Sapkin <george@sapk.in>

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index de42a6656cbf9a19f3a20bd74217b75d467816d3..b33d8e27d243576ca68f2f55863afba922875cf9 100644 (file)
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=4.22.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
@@ -65,6 +65,7 @@ define Package/samba4-libs
   $(call Package/samba4/Default)
   TITLE+= libs
   DEPENDS:= \
+       +(arm||armeb||mips||mipsel||powerpc):libatomic \
        +libcap \
        +libgnutls \
        +libopenssl \
@@ -147,7 +148,8 @@ define Package/samba4-utils/description
 endef
 
 TARGET_CFLAGS += $(FPIC) -std=gnu17
-TARGET_LDFLAGS += -Wl,--as-needed
+TARGET_LDFLAGS += -Wl,--as-needed $(if $(filter arm armeb mips mipsel powerpc,$(ARCH)),-latomic)
+
 # dont mess with sambas private rpath!
 RSTRIP:=:
 
@@ -205,6 +207,7 @@ CONFIGURE_ARGS += \
        --without-gettext \
        --without-gpgme \
        --without-iconv \
+       --without-kernel-keyring \
        --without-lttng \
        --without-pam \
        --without-regedit \