Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1191 from dangowrt/fix-nfs-kernel-server-on-musl

Browse source 
tcp_wrappers: don't set LIBS=-lnsl when building with musl
This commit is contained in:
Steven Barth 2015-05-12 09:14:08 +02:00
commit 4d3ae27577
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/tcp_wrappers/Makefile
View file

@ -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= \

22
libs/tcp_wrappers/patches/005-no--lnsl-on-musl.patch Normal file
View file

@ -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) \