From: Mark Andrews <marka@isc.org>
Date: Thu, 10 Nov 2016 00:31:21 +0000 (+1100)
Subject: 4514.   [port]          NetBSD: strip -WL, from ld command line. [RT #43204]
X-Git-Tag: v9.12.0a1~655
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=69e77384fabeced4d38f894ce022c15285e9f60b;p=thirdparty%2Fbind9.git

4514.   [port]          NetBSD: strip -WL, from ld command line. [RT #43204]
---

diff --git a/CHANGES b/CHANGES
index 1bde903a641..cf5cfd871f9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4514.	[port]		NetBSD: strip -WL, from ld command line. [RT #43204]
+
 4513.	[cleanup]	Minimum Python versions are now 2.7 and 3.2.
 			[RT #43566]
 
diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in
index df1e3c00378..2d116e8e498 100644
--- a/bin/tests/system/dyndb/driver/Makefile.in
+++ b/bin/tests/system/dyndb/driver/Makefile.in
@@ -34,6 +34,7 @@ OBJS =		db.@O@ driver.@O@ instance.@O@ \
 
 SO_TARGETS =	lib/sample.@SO@
 TARGETS =	@SO_TARGETS@
+SO_STRIP =	@SO_STRIP@
 
 @BIND9_MAKE_RULES@
 
@@ -45,8 +46,9 @@ lib/sample.@SO@: sample.@SO@
 	${LIBTOOL_MODE_INSTALL} ${INSTALL} sample.@SO@ `pwd`/lib
 
 sample.@SO@: ${OBJS} ${DNSDEPLIBS} ${ISCDEPLIBS}
+	CLEANED=`echo "${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}" | ${SO_STRIP}`; \
 	${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ ${OBJS} \
-		${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+		$${CLEANED}
 
 clean distclean::
 	rm -f ${OBJS} sample.so lib/sample.so
diff --git a/configure b/configure
index 8f5a08231ab..74e15d7b6c4 100755
--- a/configure
+++ b/configure
@@ -654,6 +654,7 @@ DLZ_DRIVER_INCLUDES
 CONTRIB_DLZ
 PG_CONFIG
 SO_TARGETS
+SO_STRIP
 SO_LD
 SO_LDFLAGS
 SO_CFLAGS
@@ -22068,6 +22069,7 @@ SO_CFLAGS=""
 SO_LDFLAGS=""
 SO_LD=""
 SO_TARGETS=""
+SO_STRIP="cat"
 
 
 # Check whether --with-dlopen was given.
@@ -22179,6 +22181,7 @@ if test "yes" = "$dlopen"; then
 			SO_CFLAGS="-fpic"
 			SO_LDFLAGS="-Bshareable -x"
 			SO_LD="ld"
+			SO_STRIP="sed -e s/-Wl,//g"
 			;;
 		*-solaris*)
 			SO_CFLAGS="-KPIC"
@@ -22226,6 +22229,7 @@ CFLAGS="$CFLAGS $SO_CFLAGS"
 
 
 
+
 # Copyright (C) 2005  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/configure.in b/configure.in
index 20751d0e2b8..5a4d0d2b900 100644
--- a/configure.in
+++ b/configure.in
@@ -4811,6 +4811,7 @@ SO_CFLAGS=""
 SO_LDFLAGS=""
 SO_LD=""
 SO_TARGETS=""
+SO_STRIP="cat"
 
 AC_ARG_WITH(dlopen,
 	[  --with-dlopen=ARG       support dynamically loadable DLZ drivers],
@@ -4863,6 +4864,7 @@ if test "yes" = "$dlopen"; then
 			SO_CFLAGS="-fpic"
 			SO_LDFLAGS="-Bshareable -x"
 			SO_LD="ld"
+			SO_STRIP="sed -e s/-Wl,//g"
 			;;
 		*-solaris*)
 			SO_CFLAGS="-KPIC"
@@ -4907,6 +4909,7 @@ AC_SUBST(SO)
 AC_SUBST(SO_CFLAGS)
 AC_SUBST(SO_LDFLAGS)
 AC_SUBST(SO_LD)
+AC_SUBST(SO_STRIP)
 AC_SUBST(SO_TARGETS)
 
 sinclude(contrib/dlz/config.dlz.in)