summaryrefslogtreecommitdiff
path: root/lang/perl58/patches/patch-ab
blob: 7e0171067b10c9e6f87f236ac89dc1316600a86e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
$NetBSD: patch-ab,v 1.2 2003/06/23 07:45:04 jlam Exp $

--- 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.
-#
-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
+locincpth="/opt/pkg/include"
+loclibpth="/opt/pkg/lib"
+ldflags="-Wl,-R/opt/pkg/lib $ldflags"
+glibpth='/usr/lib'