X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=be2af76d58d55fb02697649dc65bd88bcc41eac4;hb=6ef45c95e3f2089117ceaf5c183b202e9d068e5c;hp=82e394123885fb7785331ad4bf65511e694d4e41;hpb=7d4724f95a69a8d5a7cd565f21487912e6d331c0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 82e3941..be2af76 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -42,6 +42,17 @@ esac
 set `echo $glibpth | sed -e 's@/usr/ucblib@@' -e 's@ /lib @ @'`
 glibpth="$*"
 
+# Starting with Solaris 10, we don't want versioned shared libraries because
+# those often indicate a private use only library.  Especially badly that would
+# break things with SUNWbdb (Berkeley DB) being installed, which brings in
+# /usr/lib/libdb.so.1, but that is not really meant for public consumption.
+#  XXX Revisit after perl 5.10 -- should we apply this to older Solaris
+# versions too?  (A.D. 11/2007).
+case "`uname -r`" in
+5.[0-9]) ;;
+*) ignore_versioned_solibs=y ;;
+esac
+
 # Remove unwanted libraries.  -lucb contains incompatible routines.
 # -lld and -lsec don't do anything useful. -lcrypt does not
 # really provide anything we need over -lc, so we drop it, too.
@@ -81,7 +92,7 @@ END
 case "$cc" in
 '')	if test -f /opt/SUNWspro/bin/cc; then
 		cc=/opt/SUNWspro/bin/cc
-		cat <<EOF >&4	
+		cat <<EOF >&4
 
 You specified no cc but you seem to have the Workshop compiler
 ($cc) installed, using that.
@@ -153,7 +164,7 @@ esac
 # The path name is the last field in the output, but the type command
 # has an annoying array of possible outputs, e.g.:
 #	make is hashed (/opt/gnu/bin/make)
-# 	cc is /usr/ucb/cc
+#	cc is /usr/ucb/cc
 #	foo not found
 # use a command like type make | awk '{print $NF}' | sed 's/[()]//g'
 
@@ -197,7 +208,7 @@ cat > UU/cc.cbu <<'EOCBU'
 # be able to perform dynamic loading of extensions.  If you have a
 # problem with dynamic loading, be sure that you are using the Solaris
 # /usr/ccs/bin/as and /usr/ccs/bin/ld.  You can do that with
-#  		sh Configure -Dcc='gcc -B/usr/ccs/bin/'
+#	sh Configure -Dcc='gcc -B/usr/ccs/bin/'
 # (note the trailing slash is required).
 # Combinations that are known to work with the following hints:
 #
@@ -267,7 +278,7 @@ END
 	    # /full/path/to/ld will be the first word of the output.
 	    # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld
 
-	    # Allow that $myld may be '', due to changes in gcc's output 
+	    # Allow that $myld may be '', due to changes in gcc's output
 	    if ${myld:-ld} -V 2>&1 |
 		grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
 		# Ok, /usr/ccs/bin/ld eventually does get called.
@@ -482,7 +493,7 @@ EOM
 
 # gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822
 # if we compile regexec.c with -O.  Turn off optimization for that one
-# file.  See hints/README.hints , especially 
+# file.  See hints/README.hints , especially
 # =head2 Propagating variables to config.sh, method 3.
 #  A. Dougherty  May 24, 2002
     case "${gccversion}-${optimize}" in
@@ -491,7 +502,7 @@ EOM
 	case "$regexec_cflags" in
 	'') echo "Disabling optimization on regexec.c for gcc $gccversion" >&4
 	    regexec_cflags='optimize='
-	    echo "regexec_cflags='optimize=\"\"'" >> config.sh 
+	    echo "regexec_cflags='optimize=\"\"'" >> config.sh
 	    ;;
 	esac
 	;;
@@ -547,7 +558,7 @@ EOM
 		if test "$processor" = sparc; then
 		    loclibpth="/usr/lib/sparcv9 $loclibpth"
 		    ccflags="$ccflags -mcpu=v9"
-		fi 
+		fi
 		ccflags="$ccflags -m64"
 
 		# This adds in -Wa,-xarch=v9.  I suspect that's superfluous,