From 1c480293dde95a231de4e796d6d8b7e6de3a20b7 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 23 Jun 2003 07:45:01 +0000
Subject: 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.

---
 lang/perl58/Makefile         |  4 ++--
 lang/perl58/distinfo         |  4 ++--
 lang/perl58/patches/patch-ab | 47 ++++++++++++++++++++++++++++++++++++++------
 3 files changed, 45 insertions(+), 10 deletions(-)

(limited to 'lang/perl58')

diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 3c3fa21df6b..6c1c2649f86 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/06/02 14:05:06 abs Exp $
+# $NetBSD: Makefile,v 1.15 2003/06/23 07:45:03 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		lang devel
 
 MAINTAINER=		jlam@netbsd.org
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index ee78a538f9e..68683730402 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/05/27 21:57:26 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/06/23 07:45:03 jlam Exp $
 
 SHA1 (perl-5.8.0.tar.gz) = be1e05876ca734464f8a770d61b1f15cca555719
 Size (perl-5.8.0.tar.gz) = 11023084 bytes
 SHA1 (patch-aa) = e140f42f27fe4e2fd3786cd2c6277571b5ffd483
-SHA1 (patch-ab) = 83742476e804b156087d3782ae7f9e448030a959
+SHA1 (patch-ab) = c33566c4287c45a05990fb3f31199bd084350f55
 SHA1 (patch-ac) = 8596389f77a6eafea7817e19c46165c1a34fdda6
 SHA1 (patch-ae) = 7bb2f96693cef5b4008a02fde2bde5ae1ce73cb6
 SHA1 (patch-ah) = 39d007da11f28ab37a81b7403b92be2784e942c6
diff --git a/lang/perl58/patches/patch-ab b/lang/perl58/patches/patch-ab
index c7639a2da05..7e0171067b1 100644
--- a/lang/perl58/patches/patch-ab
+++ b/lang/perl58/patches/patch-ab
@@ -1,12 +1,43 @@
-$NetBSD: patch-ab,v 1.1 2003/05/27 04:53:10 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2003/06/23 07:45:04 jlam Exp $
 
---- hints/netbsd.sh.orig	Sat Jun  1 13:03:12 2002
-+++ hints/netbsd.sh
-@@ -127,20 +127,3 @@
-         ;; 
+--- hints/netbsd.sh.orig	Sat Jun  1 10:03:12 2002
++++ hints/netbsd.sh	Fri Jun 20 03:02:13 2003
+@@ -37,16 +37,21 @@
+ 		cccdlflags="-DPIC -fPIC $cccdlflags"
+ 		lddlflags="--whole-archive -shared $lddlflags"
+ 		rpathflag="-Wl,-rpath,"
+-		#
+-		# Include the whole libgcc.a into the perl executable so
+-		# that certain symbols needed by loadable modules built as
+-		# C++ objects (__eh_alloc, __pure_virtual, etc.) will always
+-		# be defined.
+-		#
+-		# XXX This should be obsoleted by gcc-3.0.
+-		#
+-		ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
+-			-Wl,-E $ccdlflags"
++		case "$osvers" in
++		1.[0-5]|1.[0-5].*)
++			#
++			# Include the whole libgcc.a into the perl executable
++			# so that certain symbols needed by loadable modules
++			# built as C++ objects (__eh_alloc, __pure_virtual,
++			# etc.) will always be defined.
++			#
++			ccdlflags="-Wl,-whole-archive -lgcc \
++				-Wl,-no-whole-archive -Wl,-E $ccdlflags"
++			;;
++		*)
++			ccdlflags="-Wl,-E $ccdlflags"
++			;;
++		esac
+ 	elif test -f /usr/libexec/ld.so; then
+ 		# a.out
+ 		d_dlopen=$define
+@@ -128,19 +132,7 @@
  esac 
  EOCBU
--
+ 
 -# Set sensible defaults for NetBSD: look for local software in
 -# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
 -#
@@ -23,3 +54,7 @@ $NetBSD: patch-ab,v 1.1 2003/05/27 04:53:10 jlam Exp $
 -	done
 -	;;
 -esac
++locincpth="/opt/pkg/include"
++loclibpth="/opt/pkg/lib"
++ldflags="-Wl,-R/opt/pkg/lib $ldflags"
++glibpth='/usr/lib'
-- 
cgit v1.2.3