Don't include -Wl,--whole-archive in the default LDFLAGS on NetBSD.

It breaks the build in packages when the compiler doesn't implicitly
disable it later. Bump revision.

3 files changed, 25 insertions, 19 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 85d0368abcb..425a7f19c4e 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.211 2013/11/01 14:02:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.212 2013/11/13 13:36:02 joerg Exp $
 
 .include "license.mk"
 .include "Makefile.common"
 
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Practical Extraction and Report Language
 
 CONFLICTS=	perl-base-[0-9]* perl-thread-[0-9]*			\
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 4e7bbcb2c70..76f6a793669 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.111 2013/11/01 14:02:37 jperkin Exp $
+$NetBSD: distinfo,v 1.112 2013/11/13 13:36:02 joerg Exp $
 
 SHA1 (perl-5.18.1.tar.bz2) = eb6b402682168a9735b2806d09c1ca5d567b2de8
 RMD160 (perl-5.18.1.tar.bz2) = 015c4c617474e1f2716a8c1484c44852ab459b74
@@ -14,7 +14,7 @@ SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a
-SHA1 (patch-hints_netbsd.sh) = 5b41a700282773b13cd0fefbcbef3a46ba0d2bfb
+SHA1 (patch-hints_netbsd.sh) = 027722c47bb01aa8db21e534178432cd26b49cdf
 SHA1 (patch-hv.c) = 0ed39926d620724db6d612a717d84b4efa129162
 SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f
 SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
diff --git a/lang/perl5/patches/patch-hints_netbsd.sh b/lang/perl5/patches/patch-hints_netbsd.sh
index 48ef669b4cb..e48e3b3853e 100644
--- a/lang/perl5/patches/patch-hints_netbsd.sh
+++ b/lang/perl5/patches/patch-hints_netbsd.sh
@@ -1,23 +1,29 @@
-$NetBSD: patch-hints_netbsd.sh,v 1.7 2013/08/19 12:31:11 christos Exp $
+$NetBSD: patch-hints_netbsd.sh,v 1.8 2013/11/13 13:36:02 joerg Exp $
 
 --whole-archive is a linker flag, not a compiler flag
 Better defaults for paths.
 Stop grovelling for functions we don't want to provide (*host*)
 
---- hints/netbsd.sh.orig	2013-08-19 21:23:34.000000000 +0300
-+++ hints/netbsd.sh	2013-08-19 21:23:12.000000000 +0300
-@@ -41,8 +41,8 @@
- # system gcc to build correctly, so check for it
- echo 'int f(void) { return 0; }' >try.c
- if ${cc:-cc} $cccdlflags -c try.c -otry.o 2>&1 &&
+--- hints/netbsd.sh.orig	2013-05-23 23:38:10.000000000 +0000
++++ hints/netbsd.sh
+@@ -36,16 +36,6 @@ case "$osvers" in
+ 		d_dlerror=$define
+ 		cccdlflags="-DPIC -fPIC $cccdlflags"
+ 		lddlflags="-shared $lddlflags"
+-		cat >UU/cc.cbu <<'EOCBU'
+-# gcc 4.6 doesn't support --whole-archive, but it's required for the
+-# system gcc to build correctly, so check for it
+-echo 'int f(void) { return 0; }' >try.c
+-if ${cc:-cc} $cccdlflags -c try.c -otry.o 2>&1 &&
 -   ${cc:-cc} --whole-archive $lddlflags try.o -otry.so 2>&1 ; then
 -    lddlflags="--whole-archive $lddlflags"
-+   ${cc:-cc} -Wl,--whole-archive $lddlflags try.o -otry.so 2>&1 ; then
-+    lddlflags="-Wl,--whole-archive $lddlflags"
- fi
- rm try.c try.o try.so 2>/dev/null
- EOCBU
-@@ -100,6 +100,12 @@
+-fi
+-rm try.c try.o try.so 2>/dev/null
+-EOCBU
+ 		rpathflag="-Wl,-rpath,"
+ 		case "$osvers" in
+ 		1.[0-5]*)
+@@ -100,6 +90,12 @@ case "$osvers" in
  	d_getservbyport_r="$undef"
  	d_setservent_r="$undef"
  	d_endservent_r="$undef"
@@ -30,7 +36,7 @@ Stop grovelling for functions we don't want to provide (*host*)
  	d_getprotoent_r_proto="0"
  	d_getprotobyname_r_proto="0"
  	d_getprotobynumber_r_proto="0"
-@@ -110,6 +116,12 @@
+@@ -110,6 +106,12 @@ case "$osvers" in
  	d_getservbyport_r_proto="0"
  	d_setservent_r_proto="0"
  	d_endservent_r_proto="0"
@@ -43,7 +49,7 @@ Stop grovelling for functions we don't want to provide (*host*)
  	;;
  esac
  
-@@ -186,10 +198,12 @@
+@@ -186,10 +188,12 @@ esac
  EOCBU
  
  # Set sensible defaults for NetBSD: look for local software in