Modified the link process of the perl executable so that all libgcc.a is

included in the perl executable. We need this to make the upcoming
xerces-perl package working.
This hack should be made obsolete by gcc-3.0, which will have a libgcc.so.
See http://mail-index.netbsd.org/tech-pkg/2001/04/07/0000.html for more details

4 files changed, 37 insertions, 22 deletions

diff --git a/lang/perl5-base/Makefile b/lang/perl5-base/Makefile
index 971b4f6acbe..696be68b423 100644
--- a/lang/perl5-base/Makefile
+++ b/lang/perl5-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:24 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/12 18:14:16 manu Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
 DISTNAME=		perl-${PERL_VERSION}
-PKGNAME=		perl-base-${PERL_VERSION}
+PKGNAME=		perl-base-${PERL_VERSION}nb1
 PERL_VERSION=		5.6.0
 CATEGORIES=		lang devel perl5
 MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
diff --git a/lang/perl5-base/files/patch-sum b/lang/perl5-base/files/patch-sum
index 192bfd6be93..4752c31ab79 100644
--- a/lang/perl5-base/files/patch-sum
+++ b/lang/perl5-base/files/patch-sum
@@ -1,12 +1,12 @@
-$NetBSD: patch-sum,v 1.3 2001/01/11 17:51:29 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2001/04/12 18:14:16 manu Exp $
 
-MD5 (patch-aa) = 22d1a3a613210ca5f129c81449eab10b
-MD5 (patch-ab) = 032835dd7aaab9ee4531e7e6e83ffba5
-MD5 (patch-ac) = ddd3e3b08afdc062c78f26175e4fcc44
-MD5 (patch-ad) = 76f075f7badc7dcc5a315b3c2a82657c
-MD5 (patch-ae) = 197b8ed09f99be86865c0d6d66927e96
-MD5 (patch-af) = 16d95e0667ef104d0dba4a61531d5b11
-MD5 (patch-ag) = a2e03195dab858bf57005a63043ca355
-MD5 (patch-ah) = 450115a339f77225d07d09e8554d41a9
-MD5 (patch-ai) = 27f1ec73c9eadd3252c7a7d37f2e0e11
-MD5 (patch-aj) = b4bae11ddc7f42fb317196ee853b175b
+SHA1 (patch-aa) = 574152b70a041dcd13f0f7c57a33d8068bbf776e
+SHA1 (patch-ab) = 97dc3d00c3621b923d4d37d48c5f482658094d5b
+SHA1 (patch-ac) = 0e6b9cd8f0adb0d7791c15f9216535fca6f9d813
+SHA1 (patch-ad) = 3dbd2399666ffa270b6463494752ead99aa755fd
+SHA1 (patch-ae) = 78f12e1e9f68d1ad93bbf5845ade7a8651d21208
+SHA1 (patch-af) = ecc2a7ff8d8ce6f40ddfbf1873ed04d5b3ab7e55
+SHA1 (patch-ag) = fd4cd3f029329a3dbb8fd786f19a8d97881fa2af
+SHA1 (patch-ah) = c293738f1822d474f26558b15a4071f806d5ea94
+SHA1 (patch-ai) = cb48b1316abceec5f7f337cf44b20eb6ab4056bf
+SHA1 (patch-aj) = bea0d2037649dda059872de663bb0b2c2ff32af0
diff --git a/lang/perl5-base/patches/patch-ag b/lang/perl5-base/patches/patch-ag
index 552f0fc779b..5eba5d1b724 100644
--- a/lang/perl5-base/patches/patch-ag
+++ b/lang/perl5-base/patches/patch-ag
@@ -1,11 +1,26 @@
-$NetBSD: patch-ag,v 1.1 2000/11/08 08:28:00 martin Exp $
-
 --- hints/netbsd.sh.orig	Sun Feb  6 15:57:09 2000
-+++ hints/netbsd.sh	Wed Nov  8 08:26:20 2000
-@@ -63,6 +63,23 @@
++++ hints/netbsd.sh	Sat Apr  7 22:23:39 2001
+@@ -20,9 +20,13 @@
+ *)
+ 	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, requiered for Xerces-P, which 
++		# needs __eh_alloc, __pure_virtual, and others. This should 
++		# be obsoleted by gcc-3.0
++		ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
++		    -Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
+ 		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.
+@@ -61,8 +65,25 @@
+ # there's no problem with vfork.
+ case "$usevfork" in
  '') usevfork=true ;;
  esac
- 
++
 +# Using perl's malloc leads to trouble on some toolchain versions...
 +test "$usemymalloc" || usemymalloc='n'
 +
@@ -22,7 +37,7 @@ $NetBSD: patch-ag,v 1.1 2000/11/08 08:28:00 martin Exp $
 +		optimize='-g -msoft-quad-float -O2 -DGCC2952_SPARC64_WORKAROUND'
 +	fi
 +fi
-+
+ 
  # Pre-empt the /usr/bin/perl question of installperl.
  installusrbinperl='n'
  
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index b58de559505..76eafc6470b 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2001/02/20 16:33:35 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2001/04/12 18:14:16 manu Exp $
 
-DISTNAME=		perl-5.6.0nb4
+DISTNAME=		perl-5.6.0nb5
 CATEGORIES=		lang devel perl5
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
 COMMENT=		Practical Extraction and Report Language
 
-DEPENDS+=		perl-base>=5.6.0:../../lang/perl5-base
+DEPENDS+=		perl-base>=5.6.0nb1:../../lang/perl5-base
 DEPENDS+=		p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
 DEPENDS+=		p5-Devel-DProf>=19990108:../../devel/p5-Devel-DProf
 DEPENDS+=		p5-Devel-Peek>=1.0001:../../devel/p5-Devel-Peek