Modify the probed linker flags by using a call-back script that is

generated by the hints file and invoked from within the Configure
script.  This "pkgsrc.cbu" script is called after all other call-back
scripts are called, so it's the last to modify ldflags and lddlflags.
This should fix builds on non-NetBSD platforms.

3 files changed, 33 insertions, 9 deletions

diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index ede0736863c..fa1581b68bb 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2004/11/17 22:55:15 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2004/11/23 17:32:36 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -211,11 +211,21 @@ pre-configure:
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
-		( ${ECHO} '';						\
-		  ${ECHO} 'locincpth="${LOCINCPATH}"';			\
-		  ${ECHO} 'loclibpth="${LOCLIBPATH}"';			\
+		( ${ECHO} "";						\
+		  ${ECHO} "cat > UU/pkgsrc.cbu <<'EOCBU'";		\
+		  ${ECHO} "# This script UU/pkgsrc.cbu will get 'called-back' by Configure to set"; \
+		  ${ECHO} '# linker options after all other call-back scripts have been invoked.'; \
 		  ${ECHO} 'ldflags="${PERL5_HINTS_LDFLAGS} $$ldflags"';	\
 		  ${ECHO} 'lddlflags="${PERL5_HINTS_LDFLAGS} $$lddlflags"'; \
+		  ${ECHO} "EOCBU";					\
+		) >> $${hints};						\
+	done
+	hintdir="${WRKSRC}/hints";					\
+	for hints in $${hintdir}/*.sh; do				\
+		( ${ECHO} "";						\
+		  ${ECHO} "# Set pkgsrc defaults for library and header search paths."; \
+		  ${ECHO} 'locincpth="${LOCINCPATH}"';			\
+		  ${ECHO} 'loclibpth="${LOCLIBPATH}"';			\
 		) >> $${hints};						\
 	done
 .if !empty(SYSLIBPATH)
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index 029baeb2a59..c9ec6ad9c73 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2004/11/07 16:20:11 wiz Exp $
+$NetBSD: distinfo,v 1.21 2004/11/23 17:32:36 jlam Exp $
 
 SHA1 (perl-5.8.5.tar.bz2) = 6fec546bd96070c3c14b5b5fd2cd9af3185905fe
 Size (perl-5.8.5.tar.bz2) = 9464689 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = a441cba11b12a4285284e98b6e5918efbd8bafef
 SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80
 SHA1 (patch-ah) = b180ba8d91d2ac5e685b7d23a265245605e7eb74
 SHA1 (patch-ba) = 74a01f3a86f263720b9f07d1fdbaadbaecafb012
-SHA1 (patch-ca) = 8b5a84067d229822394f724508961ab78498c1ea
+SHA1 (patch-ca) = d234dd0c90a4417b87b3c1708ba9e86dc566990c
 SHA1 (patch-cb) = 2221fb87bddd29406d925d1cb5351eb4f3087f76
 SHA1 (patch-cc) = 721459e0123c3306c44cca20e37680ec7026dd09
 SHA1 (patch-cd) = d9420f57f036567abac821a8144768a2a7057b47
diff --git a/lang/perl58/patches/patch-ca b/lang/perl58/patches/patch-ca
index 9d009a20d47..60dd4e63d06 100644
--- a/lang/perl58/patches/patch-ca
+++ b/lang/perl58/patches/patch-ca
@@ -1,6 +1,6 @@
-$NetBSD: patch-ca,v 1.4 2004/11/07 16:20:11 wiz Exp $
+$NetBSD: patch-ca,v 1.5 2004/11/23 17:32:36 jlam Exp $
 
---- Configure.orig	2004-05-12 13:00:41.000000000 +0200
+--- Configure.orig	2004-05-12 07:00:41.000000000 -0400
 +++ Configure
 @@ -7850,7 +7850,7 @@ if "$useshrplib"; then
  	solaris)
@@ -11,7 +11,21 @@ $NetBSD: patch-ca,v 1.4 2004/11/07 16:20:11 wiz Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	bsdos|linux|irix*|dec_osf)
-@@ -17288,7 +17288,15 @@ RCAT(Rei,ser)
+@@ -8971,6 +8971,13 @@ EOCP
+ 	;;
+ esac
+ 
++: Look for a hint-file generated 'call-back-unit'.  We need
++: to set some defaults for building perl in pkgsrc.
++if $test -f pkgsrc.cbu; then
++    echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
++    . ./pkgsrc.cbu
++fi
++
+ case "$vendorprefix" in
+ '')	d_vendorbin="$undef"
+ 	vendorbin=''
+@@ -17288,7 +17295,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1