diff options
| author | jlam <jlam> | 2003-06-23 07:45:01 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-06-23 07:45:01 +0000 |
| commit | 3a64070c76f0389de0e67ae142af071ef32bc961 (patch) | |
| tree | 34aebac50a6368ae61faefc1d9e5fe12ef96b2d6 /lang/perl5 | |
| parent | f77d2c13ba7c0be95ca8120c81d2405bf1ae4a51 (diff) | |
| download | pkgsrc-3a64070c76f0389de0e67ae142af071ef32bc961.tar.gz | |
Bump PKGREVISIONs of lang/perl5 and lang/perl58: modify the build so that
libgcc.a isn't linked "whole archive" into the perl executable on newer
NetBSD systems (>1.5.x). Newer NetBSD systems have libgcc_pic.a linked
into shared libraries, so this hack isn't needed. This change was tested
by building and testing textproc/xerces-p, a C++ perl5 module that uses
functions in libgcc.a.
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5/distinfo | 4 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-ab | 28 |
3 files changed, 22 insertions, 14 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index f547d120fda..9e8754f169c 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.64 2003/05/27 21:57:25 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2003/06/23 07:45:01 jlam Exp $ .include "../../lang/perl5/Makefile.common" -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES+= lang devel MAINTAINER= jlam@netbsd.org diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 87f2abb32bb..d9fd5c670c3 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.15 2003/05/27 21:57:25 jlam Exp $ +$NetBSD: distinfo,v 1.16 2003/06/23 07:45:02 jlam Exp $ SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744 Size (perl-5.6.1.tar.gz) = 5983695 bytes SHA1 (patch-aa) = c03ddd0a6c9d738cb523cbc8fb104217cc3870a1 -SHA1 (patch-ab) = 67f1f3fd8664e15449996e4c5fbe138a0c1d6def +SHA1 (patch-ab) = c30dbcbcd72896c324ad18c4adb3304a340c379f SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691 SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2 SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285 diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab index 46b5efca64d..1aec6bcfdbc 100644 --- a/lang/perl5/patches/patch-ab +++ b/lang/perl5/patches/patch-ab @@ -1,17 +1,25 @@ -$NetBSD: patch-ab,v 1.11 2002/01/30 22:35:58 jlam Exp $ +$NetBSD: patch-ab,v 1.12 2003/06/23 07:45:02 jlam Exp $ ---- hints/netbsd.sh.orig Thu Feb 22 21:57:55 2001 -+++ hints/netbsd.sh Wed Jan 30 17:02:39 2002 -@@ -21,16 +21,24 @@ +--- 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" -+ # 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" ++ 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 @@ -30,7 +38,7 @@ $NetBSD: patch-ab,v 1.11 2002/01/30 22:35:58 jlam Exp $ # 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 @@ +@@ -59,12 +75,13 @@ d_setruid="$undef" # there's no problem with vfork. |