summaryrefslogtreecommitdiff
path: root/lang/perl5
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2014-06-08 23:35:55 +0000
committerjoerg <joerg@pkgsrc.org>2014-06-08 23:35:55 +0000
commit6e643b4fb9a3b0a764c411c5d4a252d37394fe50 (patch)
tree7cfc6589bdc6e5765352461aa059c688ee69e53f /lang/perl5
parent37523f4c4bb14fbe0d0fa6bc9ae61080577a108b (diff)
downloadpkgsrc-6e643b4fb9a3b0a764c411c5d4a252d37394fe50.tar.gz
Don't try to extract the library search path from gcc/clang. It will
leak .buildlink into the final build and create a broken p5-gdbm. Bump revision.
Diffstat (limited to 'lang/perl5')
-rw-r--r--lang/perl5/Makefile3
-rw-r--r--lang/perl5/distinfo4
-rw-r--r--lang/perl5/patches/patch-ca11
3 files changed, 14 insertions, 4 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 017a8d1fb3a..5037b107543 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.227 2014/06/07 12:08:47 obache Exp $
+# $NetBSD: Makefile,v 1.228 2014/06/08 23:35:55 joerg Exp $
.include "license.mk"
.include "Makefile.common"
+PKGREVISION= 1
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 9721acc0ba1..cbb160f87a5 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.120 2014/06/07 11:58:57 obache Exp $
+$NetBSD: distinfo,v 1.121 2014/06/08 23:35:55 joerg Exp $
SHA1 (perl-5.20.0.tar.bz2) = e925e4fc36e90eace19a1ca850f912618ba6788f
RMD160 (perl-5.20.0.tar.bz2) = a14fa854f2d50aa5f16ff3a982244dd6cd0c4730
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953
SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
-SHA1 (patch-ca) = 7340d2858d5969d519b43b12e5701677b219bc84
+SHA1 (patch-ca) = dcd3ab4d69a5a54677894f35b8bc536f48a19c45
SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 8d6993a7c99..8a0ef7d8c27 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.20 2014/05/29 07:57:07 adam Exp $
+$NetBSD: patch-ca,v 1.21 2014/06/08 23:35:55 joerg Exp $
* Use "uname -r" to get OS version for *BSD.
* Move $loclibpth to the end of $dlist, instead of the beginning.
@@ -51,6 +51,15 @@ $NetBSD: patch-ca,v 1.20 2014/05/29 07:57:07 adam Exp $
solaris) osname=solaris
case "$3" in
5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
+@@ -4865,7 +4869,7 @@ esac
+ # If using gcc or clang, we can get better values for libpth, incpth
+ # and usrinc directly from the compiler.
+ # Note that ccname for clang is also gcc.
+-case "$ccname" in
++case "xx$ccname" in
+ gcc)
+ $echo 'extern int foo;' > try.c
+ set X `$cppstdin -v try.c 2>&1 | $awk '/^#include </,/^End of search /'|$cppfilter $grep '/include'`
@@ -4941,14 +4945,14 @@ case "$plibpth" in
esac
case "$libpth" in