summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjlam <jlam>2002-01-30 22:35:57 +0000
committerjlam <jlam>2002-01-30 22:35:57 +0000
commitd51f80cf2d0605eac580f630a49232affb404bdc (patch)
tree86cc3f83f4f60cf69d49e0d6e907c12597bb2504 /lang
parent12be1f7a62abc315281c4532be7763f71b9689c0 (diff)
downloadpkgsrc-d51f80cf2d0605eac580f630a49232affb404bdc.tar.gz
Fix long-standing bug where -R${PREFIX}/lib wasn't being recorded in the
LDDLFLAGS because ${PREFIX} is not defined for the sub-scripts that are executed by the Configure script. This resulted in -R/lib.
Diffstat (limited to 'lang')
-rw-r--r--lang/perl5/distinfo5
-rw-r--r--lang/perl5/patches/patch-ab13
2 files changed, 12 insertions, 6 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 04e827af46a..c04beb7cee9 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.9 2002/01/28 00:25:27 jlam Exp $
+$NetBSD: distinfo,v 1.10 2002/01/30 22:35:57 jlam Exp $
SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
Size (perl-5.6.1.tar.gz) = 5983695 bytes
SHA1 (patch-aa) = a92ec22c251a3b54d042fdcf6e2cfe6b128873c8
-SHA1 (patch-ab) = f5fb048313fd3e80dd7ad06fc4def1cbb7f0e209
+SHA1 (patch-ab) = 67f1f3fd8664e15449996e4c5fbe138a0c1d6def
SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691
SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2
SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285
SHA1 (patch-af) = 94d91fba0731c9ee43b3e544f81cc9367a75a77c
SHA1 (patch-ag) = 6f25b4799994279172bc756ede9f13506e9b1c28
SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589
+SHA1 (patch-ai) = 06ffc48b7e810deb845d0c15669c35d015c268fe
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index 9b3cc22037f..46b5efca64d 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2001/10/01 07:05:11 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2002/01/30 22:35:58 jlam Exp $
--- hints/netbsd.sh.orig Thu Feb 22 21:57:55 2001
-+++ hints/netbsd.sh
-@@ -21,12 +21,20 @@
++++ hints/netbsd.sh Wed Jan 30 17:02:39 2002
+@@ -21,16 +21,24 @@
if [ -f /usr/libexec/ld.elf_so ]; then
d_dlopen=$define
d_dlerror=$define
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.10 2001/10/01 07:05:11 jlam Exp $
+ # needs __eh_alloc, __pure_virtual, and others.
+ # XXX This should be obsoleted by gcc-3.0.
+ ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
-+ -Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
++ -Wl,-E -Wl,-R$prefix/lib $ccdlflags"
cccdlflags="-DPIC -fPIC $cccdlflags"
lddlflags="--whole-archive -shared $lddlflags"
elif [ "`uname -m`" = "pmax" ]; then
@@ -25,6 +25,11 @@ $NetBSD: patch-ab,v 1.10 2001/10/01 07:05:11 jlam Exp $
elif [ -f /usr/libexec/ld.so ]; then
d_dlopen=$define
d_dlerror=$define
+- ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags"
++ ccdlflags="-Wl,-R$prefix/lib $ccdlflags"
+ # we use -fPIC here because -fpic is *NOT* enough for some of the
+ # extensions like Tk on some netbsd platforms (the sparc is one)
+ cccdlflags="-DPIC -fPIC $cccdlflags"
@@ -59,12 +67,13 @@
d_setruid="$undef"