| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 4caa18feb70f8f3d133657c1250a53f4e292bb42 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Fri, 12 Oct 2018 12:38:02 +0800 |
| 4 | Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default |
| 5 | |
| 6 | We don't need to check libnsl.so and libresolv.so since the libnsl2 is |
| 7 | specified in DEPENDS and libresolv.so is from c libarary. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [embedded specific] |
| 10 | |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 12 | --- |
| 13 | makedefs | 22 ++-------------------- |
| 14 | 1 file changed, 2 insertions(+), 20 deletions(-) |
| 15 | |
| 16 | diff --git a/makedefs b/makedefs |
| 17 | index 2683bce..8f1b3f4 100644 |
| 18 | --- a/makedefs |
| 19 | +++ b/makedefs |
| 20 | @@ -484,16 +484,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 | @@ -561,16 +552,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 | -- |
| 57 | 2.7.4 |
| 58 | |