1*4882a593SmuzhiyunFrom 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Yi Zhao <yi.zhao@windriver.com> 3*4882a593SmuzhiyunDate: Fri, 12 Oct 2018 12:38:02 +0800 4*4882a593SmuzhiyunSubject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWe don't need to check libnsl.so and libresolv.so since the libnsl2 is 7*4882a593Smuzhiyunspecified in DEPENDS and libresolv.so is from c libarary. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Inappropriate [embedded specific] 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Yi Zhao <yi.zhao@windriver.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun makedefs | 22 ++-------------------- 14*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 20 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/makedefs b/makedefs 17*4882a593Smuzhiyunindex 2a76f20..9d5db9f 100644 18*4882a593Smuzhiyun--- a/makedefs 19*4882a593Smuzhiyun+++ b/makedefs 20*4882a593Smuzhiyun@@ -506,16 +506,7 @@ case "$SYSTEM.$RELEASE" in 21*4882a593Smuzhiyun SYSLIBS="$SYSLIBS -ldb" 22*4882a593Smuzhiyun ;; 23*4882a593Smuzhiyun esac 24*4882a593Smuzhiyun- for name in nsl resolv $GDBM_LIBS 25*4882a593Smuzhiyun- do 26*4882a593Smuzhiyun- for lib in $BUILD_SYSROOT_NSL_PATH 27*4882a593Smuzhiyun- do 28*4882a593Smuzhiyun- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { 29*4882a593Smuzhiyun- SYSLIBS="$SYSLIBS -l$name" 30*4882a593Smuzhiyun- break 31*4882a593Smuzhiyun- } 32*4882a593Smuzhiyun- done 33*4882a593Smuzhiyun- done 34*4882a593Smuzhiyun+ SYSLIBS="$SYSLIBS -lnsl -lresolv" 35*4882a593Smuzhiyun # Kernel 2.4 added IPv6 36*4882a593Smuzhiyun case "$RELEASE" in 37*4882a593Smuzhiyun 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; 38*4882a593Smuzhiyun@@ -583,16 +574,7 @@ EOF 39*4882a593Smuzhiyun SYSLIBS="$SYSLIBS -ldb" 40*4882a593Smuzhiyun ;; 41*4882a593Smuzhiyun esac 42*4882a593Smuzhiyun- for name in nsl resolv 43*4882a593Smuzhiyun- do 44*4882a593Smuzhiyun- for lib in $BUILD_SYSROOT_NSL_PATH 45*4882a593Smuzhiyun- do 46*4882a593Smuzhiyun- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { 47*4882a593Smuzhiyun- SYSLIBS="$SYSLIBS -l$name" 48*4882a593Smuzhiyun- break 49*4882a593Smuzhiyun- } 50*4882a593Smuzhiyun- done 51*4882a593Smuzhiyun- done 52*4882a593Smuzhiyun+ SYSLIBS="$SYSLIBS -lnsl -lresolv" 53*4882a593Smuzhiyun SYSLIBS="$SYSLIBS -ldl" 54*4882a593Smuzhiyun : ${SHLIB_SUFFIX=.so} 55*4882a593Smuzhiyun : ${SHLIB_CFLAGS=-fPIC} 56*4882a593Smuzhiyun-- 57*4882a593Smuzhiyun2.17.1 58*4882a593Smuzhiyun 59