diff options
author | jlam <jlam> | 2003-06-23 07:45:01 +0000 |
---|---|---|
committer | jlam <jlam> | 2003-06-23 07:45:01 +0000 |
commit | 772928c7467d07015450f69599689c94857888e4 (patch) | |
tree | 34aebac50a6368ae61faefc1d9e5fe12ef96b2d6 /lang/perl5/patches | |
parent | 72b8ba910d70f9916d5e201f9e437250d1b151c6 (diff) | |
download | pkgsrc-772928c7467d07015450f69599689c94857888e4.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/patches')
-rw-r--r-- | lang/perl5/patches/patch-ab | 28 |
1 files changed, 18 insertions, 10 deletions
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. |