Skip to contentSkip to conversation

samba4: bump to version 4.1.12

PATCH New Gustavo Zacarias 2 participants 2 messages Sep 8, 2014 – Sep 9, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 samba4: bump to version 4.1.12

Also tweak library moves since uClibc doesn't do $ORIGIN and libreplace is found that way now.

---
 package/samba4/samba4.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
package/samba4/samba4.mk +7 -5
index 541efe0..e1ee33f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA4_VERSION = 4.1.11
+SAMBA4_VERSION = 4.1.12
 SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
 SAMBA4_LICENSE = GPLv3+
@@ -124,11 +124,13 @@ define SAMBA4_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S91smb
 endef
 
-# uClibc-based builds don't like libtalloc in /usr/lib/samba
-define SAMBA4_MOVE_TALLOC
+# uClibc doesn't honor $ORIGIN so we need to move a few libs
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+define SAMBA4_MOVE_LIBS
+	mv -f $(TARGET_DIR)/usr/lib/samba/libreplace* $(TARGET_DIR)/usr/lib
 	mv -f $(TARGET_DIR)/usr/lib/samba/libtalloc* $(TARGET_DIR)/usr/lib
 endef
-
-SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_MOVE_TALLOC
+SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_MOVE_LIBS
+endif
 
 $(eval $(generic-package))
Signature · 1 line
1.8.5.5
#1 lore raw

PATCH 1/1 samba4: bump to version 4.1.12

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Also tweak library moves since uClibc doesn't do $ORIGIN and libreplace is found that way now.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard