pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang fix test for Solaris linker by also grepping for ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/87dc597afc71
branches: trunk
changeset: 462578:87dc597afc71
user: grant <grant%pkgsrc.org@localhost>
date: Sun Oct 05 14:19:09 2003 +0000
description:
fix test for Solaris linker by also grepping for "ld: Solaris Link
Editors", reported by Dima Veselov <kab00m%lich.phys.spbu.ru@localhost> in
private mail.
also move hints/ patches to patch-b* to keep track of them more
easily.
diffstat:
lang/perl5/distinfo | 9 +++---
lang/perl5/patches/patch-ab | 58 --------------------------------------------
lang/perl5/patches/patch-ak | 32 ------------------------
lang/perl5/patches/patch-ba | 58 ++++++++++++++++++++++++++++++++++++++++++++
lang/perl5/patches/patch-bb | 32 ++++++++++++++++++++++++
lang/perl5/patches/patch-bc | 15 +++++++++++
lang/perl58/distinfo | 5 ++-
lang/perl58/patches/patch-ab | 28 ---------------------
lang/perl58/patches/patch-ba | 28 +++++++++++++++++++++
lang/perl58/patches/patch-bc | 15 +++++++++++
10 files changed, 156 insertions(+), 124 deletions(-)
diffs (truncated from 338 to 300 lines):
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl5/distinfo
--- a/lang/perl5/distinfo Sun Oct 05 14:16:41 2003 +0000
+++ b/lang/perl5/distinfo Sun Oct 05 14:19:09 2003 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.17 2003/10/04 07:38:45 reed Exp $
+$NetBSD: distinfo,v 1.18 2003/10/05 14:19:09 grant Exp $
SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
Size (perl-5.6.1.tar.gz) = 5983695 bytes
-SHA1 (patch-aa) = ceb14704b03223679cb08099c3fe71dc1bc08be2
-SHA1 (patch-ab) = c30dbcbcd72896c324ad18c4adb3304a340c379f
+SHA1 (patch-aa) = f15f873160a611e35978a24fdabad29dabdff043
SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691
SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2
SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285
@@ -11,6 +10,8 @@
SHA1 (patch-ag) = 3ffe02cc745234b067c991b66024c17864f5babe
SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589
SHA1 (patch-aj) = 4da55b4bb1e1607fde7a3d9510ca3d6a90f8c10b
-SHA1 (patch-ak) = 7aa35848111a62c608e792f025b7095513d7041b
SHA1 (patch-al) = 96b68e38900053109caeb10326cce6e17f58dcab
SHA1 (patch-am) = 57af2f39327951e321fcb6985aa2d74c090278c6
+SHA1 (patch-ba) = c30dbcbcd72896c324ad18c4adb3304a340c379f
+SHA1 (patch-bb) = 7aa35848111a62c608e792f025b7095513d7041b
+SHA1 (patch-bc) = 6f3c2a279065872f836a9d7bb79d127975227952
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl5/patches/patch-ab
--- a/lang/perl5/patches/patch-ab Sun Oct 05 14:16:41 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2003/06/23 07:45:02 jlam Exp $
-
---- hints/netbsd.sh.orig Thu Feb 22 18:57:55 2001
-+++ hints/netbsd.sh Fri Jun 20 17:59:50 2003
-@@ -21,16 +21,32 @@
- if [ -f /usr/libexec/ld.elf_so ]; then
- d_dlopen=$define
- d_dlerror=$define
-- ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
-+ case "$osvers" in
-+ 1.[0-5]|1.[0-5].*)
-+ # Include the whole libgcc.a, required for Xerces-P,
-+ # which 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"
-+ ;;
-+ *)
-+ ccdlflags="-Wl,-E -Wl,-R$prefix/lib $ccdlflags"
-+ ;;
-+ esac
- cccdlflags="-DPIC -fPIC $cccdlflags"
- lddlflags="--whole-archive -shared $lddlflags"
- elif [ "`uname -m`" = "pmax" ]; then
- # NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work.
-- d_dlopen=$undef
-+ case "$osvers" in
-+ 1.3|1.3.1)
-+ d_dlopen=$undef
-+ ;;
-+ esac
- 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 +75,13 @@
- d_setruid="$undef"
-
- # there's no problem with vfork.
--case "$usevfork" in
--'') usevfork=true ;;
--esac
-+usevfork=true
-+
-+# Using perl's malloc leads to trouble on some toolchain versions.
-+usemymalloc="$undef"
-
- # Pre-empt the /usr/bin/perl question of installperl.
--installusrbinperl='n'
-+installusrbinperl="$undef"
-
- # Recognize the NetBSD packages collection.
- # GDBM might be here.
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl5/patches/patch-ak
--- a/lang/perl5/patches/patch-ak Sun Oct 05 14:16:41 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/02/21 14:42:15 grant Exp $
-
---- hints/freebsd.sh.orig Sun Apr 8 16:09:16 2001
-+++ hints/freebsd.sh
-@@ -85,10 +85,17 @@ case "$osvers" in
- d_setreuid='define'
- d_setegid='undef'
- d_seteuid='undef'
-+ d_dosuid='define'
- ;;
- *) usevfork='true'
- usemymalloc='n'
- libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+ libswanted=`echo $libswanted | sed 's/ bind / /'`
-+ d_setregid='define'
-+ d_setreuid='define'
-+ d_setegid='undef'
-+ d_seteuid='undef'
-+ d_dosuid='define'
- ;;
- esac
-
-@@ -115,7 +122,8 @@ case "$osvers" in
- fi
- lddlflags='-Bshareable'
- fi
-- cccdlflags='-DPIC -fpic'
-+ cccdlflags='-DPIC -fPIC'
-+ libswanted=`echo $libswanted | sed 's/ iconv / /'`
- ;;
- esac
-
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl5/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/perl5/patches/patch-ba Sun Oct 05 14:19:09 2003 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-ba,v 1.1 2003/10/05 14:19:09 grant Exp $
+
+--- hints/netbsd.sh.orig Thu Feb 22 18:57:55 2001
++++ hints/netbsd.sh Fri Jun 20 17:59:50 2003
+@@ -21,16 +21,32 @@
+ if [ -f /usr/libexec/ld.elf_so ]; then
+ d_dlopen=$define
+ d_dlerror=$define
+- ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
++ case "$osvers" in
++ 1.[0-5]|1.[0-5].*)
++ # Include the whole libgcc.a, required for Xerces-P,
++ # which 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"
++ ;;
++ *)
++ ccdlflags="-Wl,-E -Wl,-R$prefix/lib $ccdlflags"
++ ;;
++ esac
+ cccdlflags="-DPIC -fPIC $cccdlflags"
+ lddlflags="--whole-archive -shared $lddlflags"
+ elif [ "`uname -m`" = "pmax" ]; then
+ # NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work.
+- d_dlopen=$undef
++ case "$osvers" in
++ 1.3|1.3.1)
++ d_dlopen=$undef
++ ;;
++ esac
+ 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 +75,13 @@
+ d_setruid="$undef"
+
+ # there's no problem with vfork.
+-case "$usevfork" in
+-'') usevfork=true ;;
+-esac
++usevfork=true
++
++# Using perl's malloc leads to trouble on some toolchain versions.
++usemymalloc="$undef"
+
+ # Pre-empt the /usr/bin/perl question of installperl.
+-installusrbinperl='n'
++installusrbinperl="$undef"
+
+ # Recognize the NetBSD packages collection.
+ # GDBM might be here.
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl5/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/perl5/patches/patch-bb Sun Oct 05 14:19:09 2003 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-bb,v 1.1 2003/10/05 14:19:09 grant Exp $
+
+--- hints/freebsd.sh.orig Sun Apr 8 16:09:16 2001
++++ hints/freebsd.sh
+@@ -85,10 +85,17 @@ case "$osvers" in
+ d_setreuid='define'
+ d_setegid='undef'
+ d_seteuid='undef'
++ d_dosuid='define'
+ ;;
+ *) usevfork='true'
+ usemymalloc='n'
+ libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ libswanted=`echo $libswanted | sed 's/ bind / /'`
++ d_setregid='define'
++ d_setreuid='define'
++ d_setegid='undef'
++ d_seteuid='undef'
++ d_dosuid='define'
+ ;;
+ esac
+
+@@ -115,7 +122,8 @@ case "$osvers" in
+ fi
+ lddlflags='-Bshareable'
+ fi
+- cccdlflags='-DPIC -fpic'
++ cccdlflags='-DPIC -fPIC'
++ libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ ;;
+ esac
+
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl5/patches/patch-bc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/perl5/patches/patch-bc Sun Oct 05 14:19:09 2003 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2003/10/05 14:19:09 grant Exp $
+
+--- hints/solaris_2.sh.orig 2001-02-23 13:57:55.000000000 +1100
++++ hints/solaris_2.sh
+@@ -239,6 +239,10 @@ END
+ # All Solaris versions of ld I've seen contain the magic
+ # string used in the grep.
+ :
++ elif echo "$verbose" | grep "ld: Solaris Link Editors" >/dev/null 2>&1; then
++ # This string has also been observed "in the wild" as
++ # being the Solaris linker.
++ :
+ else
+ # No evidence yet of /usr/ccs/bin/ld. Some versions
+ # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl58/distinfo
--- a/lang/perl58/distinfo Sun Oct 05 14:16:41 2003 +0000
+++ b/lang/perl58/distinfo Sun Oct 05 14:19:09 2003 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/10/05 07:07:14 jlam Exp $
+$NetBSD: distinfo,v 1.9 2003/10/05 14:26:00 grant Exp $
SHA1 (perl-5.8.1.tar.gz) = 838a2f55927d14a9c8f239ebd8f40e33572f2800
Size (perl-5.8.1.tar.gz) = 11857808 bytes
-SHA1 (patch-ab) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e
SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80
SHA1 (patch-ah) = 2bfaf2503589ae3dbedaf7ee61561ed58054938e
+SHA1 (patch-ba) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e
+SHA1 (patch-bc) = 6bd07e902563079dd5642eac321ca7f9271ab8a6
SHA1 (patch-zc) = eb81edd1144ec46285898afc641c03a3aad54977
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl58/patches/patch-ab
--- a/lang/perl58/patches/patch-ab Sun Oct 05 14:16:41 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/10/05 07:07:14 jlam Exp $
-
---- hints/netbsd.sh.orig Tue Jul 1 23:49:58 2003
-+++ hints/netbsd.sh Wed Jul 2 11:49:17 2003
-@@ -133,23 +133,6 @@
- esac
- EOCBU
-
--# Set sensible defaults for NetBSD: look for local software in
--# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
--#
--loclibpth="/usr/pkg/lib /usr/local/lib"
--locincpth="/usr/pkg/include /usr/local/include"
--case "$rpathflag" in
--'')
-- ldflags=
-- ;;
--*)
-- ldflags=
-- for yyy in $loclibpth; do
-- ldflags="$ldflags $rpathflag$yyy"
-- done
-- ;;
--esac
--
- case `uname -m` in
- alpha)
- echo 'int main() {}' > try.c
diff -r 18caa3f33c14 -r 87dc597afc71 lang/perl58/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/perl58/patches/patch-ba Sun Oct 05 14:19:09 2003 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ba,v 1.1 2003/10/05 14:26:00 grant Exp $
+
+--- hints/netbsd.sh.orig Tue Jul 1 23:49:58 2003
++++ hints/netbsd.sh Wed Jul 2 11:49:17 2003
+@@ -133,23 +133,6 @@
+ esac
+ EOCBU
+
+-# Set sensible defaults for NetBSD: look for local software in
Home |
Main Index |
Thread Index |
Old Index