From 544486252c441c75068e6611212869d05485a905 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 25 Apr 2015 23:19:30 +0200 Subject: [PATCH] tcp_wrappers: don't set LIBS=-lnsl when building with musl Signed-off-by: Daniel Golle --- libs/tcp_wrappers/Makefile | 6 ++++- .../patches/005-no--lnsl-on-musl.patch | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 libs/tcp_wrappers/patches/005-no--lnsl-on-musl.patch diff --git a/libs/tcp_wrappers/Makefile b/libs/tcp_wrappers/Makefile index 1ea637f29..d453031ec 100644 --- a/libs/tcp_wrappers/Makefile +++ b/libs/tcp_wrappers/Makefile @@ -32,11 +32,15 @@ endef TARGET_CFLAGS += $(FPIC) +ifeq ($(CONFIG_USE_MUSL),) +TARGET_EXTRA_LIBS:=LIBS=-lnsl +endif + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ OPT_CFLAGS="$(TARGET_CFLAGS)" \ - LIBS=-lnsl \ + $(TARGET_EXTRA_LIBS) \ NETGROUP= \ VSYSLOG= \ BUGS= \ diff --git a/libs/tcp_wrappers/patches/005-no--lnsl-on-musl.patch b/libs/tcp_wrappers/patches/005-no--lnsl-on-musl.patch new file mode 100644 index 000000000..5e7b968dd --- /dev/null +++ b/libs/tcp_wrappers/patches/005-no--lnsl-on-musl.patch @@ -0,0 +1,22 @@ +Index: tcp_wrappers_7.6/Makefile +=================================================================== +--- tcp_wrappers_7.6.orig/Makefile ++++ tcp_wrappers_7.6/Makefile +@@ -1,4 +1,4 @@ +-GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h) ++GLIBC=$(shell grep -s -c __GLIBC__ ${STAGING_DIR}/usr/include/features.h) + + # @(#) Makefile 1.23 97/03/21 19:27:20 + +@@ -146,9 +146,11 @@ freebsd: + LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ + EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all + ++ifneq ($(GLIBC),) + ifneq ($(GLIBC),0) + MYLIB=-lnsl + endif ++endif + + linux: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \