From 4d5de5cdf9957ad2d6a910f769ef4016b1d93c7e Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sun, 9 Dec 2001 20:31:38 +0000
Subject: [PATCH] metaconfig unit changes for #13560.

p4raw-id: //depot/metaconfig@13562
---
 U/perl/dlsrc.U    | 2 +-
 U/perl/i_ieeefp.U | 7 +++++--
 U/perl/libperl.U  | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/U/perl/dlsrc.U b/U/perl/dlsrc.U
index b87251a..47978c1 100644
--- a/U/perl/dlsrc.U
+++ b/U/perl/dlsrc.U
@@ -227,7 +227,7 @@ EOM
 	esac
 	for thisflag in $ldflags; do
 		case "$thisflag" in
-		-L*|-R*)
+		-L*|-R*|-Wl,-R*)
 			case " $dflt " in
 			*" $thisflag "*) ;;
 			*) dflt="$dflt $thisflag" ;;
diff --git a/U/perl/i_ieeefp.U b/U/perl/i_ieeefp.U
index 427422d..98afe2d 100644
--- a/U/perl/i_ieeefp.U
+++ b/U/perl/i_ieeefp.U
@@ -19,6 +19,9 @@
 ?H:.
 ?LINT:set i_ieeefp
 : see if this is a ieeefp.h system
-set ieeefp.h i_ieeefp
-eval $inhdr
+case "$i_ieeefp" in
+'' ) set ieeefp.h i_ieeefp
+     eval $inhdr
+     ;;
+esac
 
diff --git a/U/perl/libperl.U b/U/perl/libperl.U
index 480f862..39e6d0d 100644
--- a/U/perl/libperl.U
+++ b/U/perl/libperl.U
@@ -35,7 +35,7 @@
 ?S:		shrpenv=''
 ?S:	See the main perl Makefile.SH for actual working usage.
 ?S: Alternatively, we might be able to use a command line option such
-?S:	as -R $archlibexp/CORE (Solaris, NetBSD) or -Wl,-rpath
+?S:	as -R $archlibexp/CORE (Solaris) or -Wl,-rpath
 ?S:	$archlibexp/CORE (Linux).
 ?S:.
 ?S:ldlibpthname:
@@ -209,10 +209,10 @@ if "$useshrplib"; then
 	aix)
 		# We'll set it in Makefile.SH...
 		;;
-	solaris|netbsd)
+	solaris)
 		xxx="-R $shrpdir"
 		;;
-	freebsd)
+	freebsd|netbsd)
 		xxx="-Wl,-R$shrpdir"
 		;;
 	linux|irix*|dec_osf)
-- 
1.8.3.1