diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2014-09-08 11:07:13 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-09-09 23:03:27 +0200 |
| commit | 3be20df68f9786719f6d7a3454c54815923bdccf (patch) | |
| tree | 18fd834a4171cc8e71009b64993c2866feac28ce | |
| parent | e3a7f3f3ad38fc7a46d43e0eeafbc9ad341c90f7 (diff) | |
| download | buildroot-3be20df68f9786719f6d7a3454c54815923bdccf.tar.gz buildroot-3be20df68f9786719f6d7a3454c54815923bdccf.zip | |
samba4: bump to version 4.1.12
Also tweak library moves since uClibc doesn't do $ORIGIN and libreplace
is found that way now.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/samba4/samba4.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 541efe0015..e1ee33f0c4 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -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)) |
