samba4: add optional libbsd dependency
PATCH 1/2 samba4: add optional libbsd dependency
It's used for some small functions like md5 support, non-essential since samba has an internal fallback for those, but still add it for predictability.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/samba4/samba4.mk | 1 + 1 file changed, 1 insertion(+)
package/samba4/samba4.mk +1 -0
@@ -11,6 +11,7 @@ SAMBA4_INSTALL_STAGING = YES SAMBA4_LICENSE = GPLv3+ SAMBA4_LICENSE_FILES = COPYING SAMBA4_DEPENDENCIES = host-e2fsprogs host-heimdal e2fsprogs popt python zlib \ + $(if $(BR2_PACKAGE_LIBBSD),libbsd) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ $(if $(BR2_PACKAGE_READLINE),readline)
Signature · 1 line
2.4.10
PATCH 2/2 libbsd: add patch for clock_gettime usage
libbsd uses clock_gettime() but doesn't check for it in librt. This causes breakage on old glibc versions (< 2.17). Fixes:
http://autobuild.buildroot.net/results/a5b/a5b837d6d02ec96ac53c5b1c531a0c8e7eafeb9a/
Signed-off-by Gustavo Zacarias <[email protected]>
--- ...0001-build-clock_gettime-might-need-librt.patch | 49 ++++++++++++++++++++++ package/libbsd/libbsd.mk | 3 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 package/libbsd/0001-build-clock_gettime-might-need-librt.patch
package/libbsd/0001-build-clock_gettime-might-need-librt.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 188049ac7adcabfa66e5b6a674ac28a2f7da81f3 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <[email protected]> +Date: Fri, 12 Feb 2016 11:06:58 -0300 +Subject: [PATCH] build: clock_gettime might need librt + +In older glibc versions (< 2.17) clock_gettime is in librt. +Add a check for this to avoid build breakage for programs/libraries that +use libbsd on such systems. + +Signed-off-by: Gustavo Zacarias <[email protected]> +--- +Patch status: submitted upstream + + configure.ac | 5 +++++ + src/Makefile.am | 2 ++ + 2 files changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d334774..1862d19 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -44,6 +44,11 @@ AC_SUBST([TESTU01_LIBS]) + AM_CONDITIONAL([HAVE_LIBTESTU01], + [test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"]) + ++# In old glibc versions (< 2.17) clock_gettime() is in librt ++AC_SEARCH_LIBS([clock_gettime], [rt], ++ [LIB_CLOCK_GETTIME="-lrt"]) ++AC_SUBST([LIB_CLOCK_GETTIME]) ++ + # Checks for header files. + AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4649937..6b705f0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,6 +52,8 @@ hash/md5hl.c: $(srcdir)/hash/helper.c + libbsd_la_DEPENDENCIES = \ + $(libbsd_la_included_sources) \ + libbsd.map ++libbsd_la_LIBADD = \ ++ $(LIB_CLOCK_GETTIME) + libbsd_la_LDFLAGS = \ + -Wl,--version-script=$(srcdir)/libbsd.map \ + -version-number $(LIBBSD_ABI) +-- +2.4.10 +
package/libbsd/libbsd.mk +2 -1
@@ -9,7 +9,8 @@ LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = http://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-3c, MIT LIBBSD_LICENSE_FILES = COPYING - LIBBSD_INSTALL_STAGING = YES +# For 0001-build-clock_gettime-might-need-librt.patch +LIBBSD_AUTORECONF = YES $(eval $(autotools-package))
Signature · 1 line
2.4.10
PATCH 1/2 samba4: add optional libbsd dependency
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 8 lines · Gustavo Zacarias
It's used for some small functions like md5 support, non-essential since samba has an internal fallback for those, but still add it for predictability.
Signed-off-by Gustavo Zacarias <[email protected]>--- package/samba4/samba4.mk | 1 + 1 file changed, 1 insertion(+)
Both applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com