diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-09-11 14:31:31 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-09-11 14:31:31 +0000 |
| commit | 98e8b4b2a964ac79f0b3a5892faa8be6cc44794c (patch) | |
| tree | 64e59ebfd45cb6e5db41c5d950c3a70966e274ed | |
| parent | 32e96396534403438c705e309fd0fb414bb6bdea (diff) | |
| download | pkgsrc-98e8b4b2a964ac79f0b3a5892faa8be6cc44794c.tar.gz | |
Ensure -lssp is added to $lddlflags on SunOS when using -fstack-protector,
fixing a number of packages with __stack_chk_* symbol failures.
Bump PKGREVISION.
| -rw-r--r-- | lang/perl5/Makefile | 3 | ||||
| -rw-r--r-- | lang/perl5/distinfo | 4 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-ca | 24 |
3 files changed, 23 insertions, 8 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index a2ceb479eca..35d5a4112dd 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.209 2013/08/31 15:28:32 adam Exp $ +# $NetBSD: Makefile,v 1.210 2013/09/11 14:31:31 jperkin 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 66a6519363a..a5cef51b430 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.109 2013/08/31 15:28:32 adam Exp $ +$NetBSD: distinfo,v 1.110 2013/09/11 14:31:31 jperkin Exp $ SHA1 (perl-5.18.1.tar.bz2) = eb6b402682168a9735b2806d09c1ca5d567b2de8 RMD160 (perl-5.18.1.tar.bz2) = 015c4c617474e1f2716a8c1484c44852ab459b74 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12 SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc -SHA1 (patch-ca) = 54071603e84ee97efe2c8f8f3af0681484a345e7 +SHA1 (patch-ca) = 2664703693f9151e6403512b54cd6aecff26c06b 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 0c338505969..4a939b43d73 100644 --- a/lang/perl5/patches/patch-ca +++ b/lang/perl5/patches/patch-ca @@ -1,12 +1,14 @@ -$NetBSD: patch-ca,v 1.15 2013/06/06 14:20:14 jperkin Exp $ +$NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $ * Use "uname -r" to get OS version for *BSD. * Move $loclibpth to the end of $dlist, instead of the beginning. +* Add -lssp when using -fstack-protector on SunOS + * Several other changes. ---- Configure.orig 2013-05-10 14:13:56.000000000 +0000 +--- Configure.orig 2013-08-12 02:44:47.000000000 +0000 +++ Configure @@ -3274,13 +3274,14 @@ EOM osvers="$3" @@ -108,7 +110,19 @@ $NetBSD: patch-ca,v 1.15 2013/06/06 14:20:14 jperkin Exp $ : Figure out where the libc is located case "$runnm" in true) -@@ -8347,7 +8361,7 @@ if "$useshrplib"; then +@@ -8094,7 +8108,10 @@ EOM + *-fstack-protector*) + case "$dflt" in + *-fstack-protector*) ;; # Don't add it again +- *) dflt="$dflt -fstack-protector" ;; ++ *) case "$osname" in ++ solaris) dflt="$dflt -fstack-protector -lssp" ;; ++ *) dflt="$dflt -fstack-protector" ;; ++ esac ;; + esac + ;; + esac +@@ -8347,7 +8364,7 @@ if "$useshrplib"; then # next doesn't like the default... ;; haiku) @@ -117,7 +131,7 @@ $NetBSD: patch-ca,v 1.15 2013/06/06 14:20:14 jperkin Exp $ ;; hpux*) # hpux doesn't like the default, either. -@@ -9431,6 +9445,13 @@ esac +@@ -9431,6 +9448,13 @@ esac : Check if we want perlio useperlio="$define" @@ -131,7 +145,7 @@ $NetBSD: patch-ca,v 1.15 2013/06/06 14:20:14 jperkin Exp $ : Set the vendorbin variables case "$vendorprefix" in '') d_vendorbin="$undef" -@@ -19243,7 +19264,15 @@ RCAT(Rei,ser) +@@ -19243,7 +19267,15 @@ RCAT(Rei,ser) ACAT(Cir,cus) EOCP $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1 |