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