Wed Nov 13 13:36:02 2013 UTC ()
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.


(joerg)
diff -r1.211 -r1.212 pkgsrc/lang/perl5/Makefile
diff -r1.111 -r1.112 pkgsrc/lang/perl5/distinfo
diff -r1.7 -r1.8 pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh
cvs diff -r1.211 -r1.212 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2013/11/01 14:02:37 1.211
+++ pkgsrc/lang/perl5/Makefile 2013/11/13 13:36:02 1.212
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.211 2013/11/01 14:02:37 jperkin Exp $ 1# $NetBSD: Makefile,v 1.212 2013/11/13 13:36:02 joerg Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 2 6PKGREVISION= 3
7COMMENT= Practical Extraction and Report Language 7COMMENT= Practical Extraction and Report Language
8 8
9CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 9CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
10 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \ 10 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \
11 p5-Tie-File-0.96{,nb*} \ 11 p5-Tie-File-0.96{,nb*} \
12 p5-Memoize-1.01{,nb*} \ 12 p5-Memoize-1.01{,nb*} \
13 p5-I18N-LangTags<0.35 \ 13 p5-I18N-LangTags<0.35 \
14 p5-Locale-Maketext<1.22 \ 14 p5-Locale-Maketext<1.22 \
15 p5-Locale-Maketext-Simple<0.21 \ 15 p5-Locale-Maketext-Simple<0.21 \
16 p5-Digest<=1.16 \ 16 p5-Digest<=1.16 \
17 p5-Digest-MD5<=2.39 \ 17 p5-Digest-MD5<=2.39 \
18 p5-Digest-SHA<2.48 18 p5-Digest-SHA<2.48
19 19
cvs diff -r1.111 -r1.112 pkgsrc/lang/perl5/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2013/11/01 14:02:37 1.111
+++ pkgsrc/lang/perl5/distinfo 2013/11/13 13:36:02 1.112
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.111 2013/11/01 14:02:37 jperkin Exp $ 1$NetBSD: distinfo,v 1.112 2013/11/13 13:36:02 joerg Exp $
2 2
3SHA1 (perl-5.18.1.tar.bz2) = eb6b402682168a9735b2806d09c1ca5d567b2de8 3SHA1 (perl-5.18.1.tar.bz2) = eb6b402682168a9735b2806d09c1ca5d567b2de8
4RMD160 (perl-5.18.1.tar.bz2) = 015c4c617474e1f2716a8c1484c44852ab459b74 4RMD160 (perl-5.18.1.tar.bz2) = 015c4c617474e1f2716a8c1484c44852ab459b74
5Size (perl-5.18.1.tar.bz2) = 14059628 bytes 5Size (perl-5.18.1.tar.bz2) = 14059628 bytes
6SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5 6SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5
7SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d 7SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d
8SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12 8SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
9SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e 9SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
10SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc 10SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
11SHA1 (patch-ca) = 8d060de546b2ea3ab08e6b0f3b25bfe357fd8279 11SHA1 (patch-ca) = 8d060de546b2ea3ab08e6b0f3b25bfe357fd8279
12SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 12SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
13SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee 13SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
14SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 14SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
15SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470 15SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
16SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a 16SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a
17SHA1 (patch-hints_netbsd.sh) = 5b41a700282773b13cd0fefbcbef3a46ba0d2bfb 17SHA1 (patch-hints_netbsd.sh) = 027722c47bb01aa8db21e534178432cd26b49cdf
18SHA1 (patch-hv.c) = 0ed39926d620724db6d612a717d84b4efa129162 18SHA1 (patch-hv.c) = 0ed39926d620724db6d612a717d84b4efa129162
19SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f 19SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f
20SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f 20SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
21SHA1 (patch-ze) = 211ed6065ecf2ca02f8e95283c2d67a64c2e6b41 21SHA1 (patch-ze) = 211ed6065ecf2ca02f8e95283c2d67a64c2e6b41
cvs diff -r1.7 -r1.8 pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh 2013/08/19 12:31:11 1.7
+++ pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh 2013/11/13 13:36:02 1.8
@@ -1,59 +1,65 @@ @@ -1,59 +1,65 @@
1$NetBSD: patch-hints_netbsd.sh,v 1.7 2013/08/19 12:31:11 christos Exp $ 1$NetBSD: patch-hints_netbsd.sh,v 1.8 2013/11/13 13:36:02 joerg Exp $
2 2
3--whole-archive is a linker flag, not a compiler flag 3--whole-archive is a linker flag, not a compiler flag
4Better defaults for paths. 4Better defaults for paths.
5Stop grovelling for functions we don't want to provide (*host*) 5Stop grovelling for functions we don't want to provide (*host*)
6 6
7--- hints/netbsd.sh.orig 2013-08-19 21:23:34.000000000 +0300 7--- hints/netbsd.sh.orig 2013-05-23 23:38:10.000000000 +0000
8+++ hints/netbsd.sh 2013-08-19 21:23:12.000000000 +0300 8+++ hints/netbsd.sh
9@@ -41,8 +41,8 @@ 9@@ -36,16 +36,6 @@ case "$osvers" in
10 # system gcc to build correctly, so check for it 10 d_dlerror=$define
11 echo 'int f(void) { return 0; }' >try.c 11 cccdlflags="-DPIC -fPIC $cccdlflags"
12 if ${cc:-cc} $cccdlflags -c try.c -otry.o 2>&1 && 12 lddlflags="-shared $lddlflags"
 13- cat >UU/cc.cbu <<'EOCBU'
 14-# gcc 4.6 doesn't support --whole-archive, but it's required for the
 15-# system gcc to build correctly, so check for it
 16-echo 'int f(void) { return 0; }' >try.c
 17-if ${cc:-cc} $cccdlflags -c try.c -otry.o 2>&1 &&
13- ${cc:-cc} --whole-archive $lddlflags try.o -otry.so 2>&1 ; then 18- ${cc:-cc} --whole-archive $lddlflags try.o -otry.so 2>&1 ; then
14- lddlflags="--whole-archive $lddlflags" 19- lddlflags="--whole-archive $lddlflags"
15+ ${cc:-cc} -Wl,--whole-archive $lddlflags try.o -otry.so 2>&1 ; then 20-fi
16+ lddlflags="-Wl,--whole-archive $lddlflags" 21-rm try.c try.o try.so 2>/dev/null
17 fi 22-EOCBU
18 rm try.c try.o try.so 2>/dev/null 23 rpathflag="-Wl,-rpath,"
19 EOCBU 24 case "$osvers" in
20@@ -100,6 +100,12 @@ 25 1.[0-5]*)
 26@@ -100,6 +90,12 @@ case "$osvers" in
21 d_getservbyport_r="$undef" 27 d_getservbyport_r="$undef"
22 d_setservent_r="$undef" 28 d_setservent_r="$undef"
23 d_endservent_r="$undef" 29 d_endservent_r="$undef"
24+ d_gethostbyname_r="$undef" 30+ d_gethostbyname_r="$undef"
25+ d_gethostbyaddr2_r="$undef" 31+ d_gethostbyaddr2_r="$undef"
26+ d_gethostbyaddr_r="$undef" 32+ d_gethostbyaddr_r="$undef"
27+ d_sethostent_r="$undef" 33+ d_sethostent_r="$undef"
28+ d_gethostent_r="$undef" 34+ d_gethostent_r="$undef"
29+ d_endhostent_r="$undef" 35+ d_endhostent_r="$undef"
30 d_getprotoent_r_proto="0" 36 d_getprotoent_r_proto="0"
31 d_getprotobyname_r_proto="0" 37 d_getprotobyname_r_proto="0"
32 d_getprotobynumber_r_proto="0" 38 d_getprotobynumber_r_proto="0"
33@@ -110,6 +116,12 @@ 39@@ -110,6 +106,12 @@ case "$osvers" in
34 d_getservbyport_r_proto="0" 40 d_getservbyport_r_proto="0"
35 d_setservent_r_proto="0" 41 d_setservent_r_proto="0"
36 d_endservent_r_proto="0" 42 d_endservent_r_proto="0"
37+ d_gethostbyname_r_proto="0" 43+ d_gethostbyname_r_proto="0"
38+ d_gethostbyaddr2_r_proto="0" 44+ d_gethostbyaddr2_r_proto="0"
39+ d_gethostbyaddr_r_proto="0" 45+ d_gethostbyaddr_r_proto="0"
40+ d_sethostent_r_proto="0" 46+ d_sethostent_r_proto="0"
41+ d_endhostent_r_proto="0" 47+ d_endhostent_r_proto="0"
42+ d_gethostent_r_proto="0" 48+ d_gethostent_r_proto="0"
43 ;; 49 ;;
44 esac 50 esac
45  51
46@@ -186,10 +198,12 @@ 52@@ -186,10 +188,12 @@ esac
47 EOCBU 53 EOCBU
48  54
49 # Set sensible defaults for NetBSD: look for local software in 55 # Set sensible defaults for NetBSD: look for local software in
50-# /usr/pkg (NetBSD Packages Collection) and in /usr/local. 56-# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
51+# /usr/local, plus the build prefix, which might or might not be 57+# /usr/local, plus the build prefix, which might or might not be
52+# /usr/pkg. 58+# /usr/pkg.
53 # 59 #
54-loclibpth="/usr/pkg/lib /usr/local/lib" 60-loclibpth="/usr/pkg/lib /usr/local/lib"
55-locincpth="/usr/pkg/include /usr/local/include" 61-locincpth="/usr/pkg/include /usr/local/include"
56+loclibpth="/usr/local/lib ${prefix}/lib" 62+loclibpth="/usr/local/lib ${prefix}/lib"
57+locincpth="/usr/local/include ${prefix}/include" 63+locincpth="/usr/local/include ${prefix}/include"
58+ 64+
59 case "$rpathflag" in 65 case "$rpathflag" in