Upgrade to ExtUtils::MakeMaker 6.28

[p5sagit/p5-mst-13.2.git] / hints / linux.sh

diff --git a/hints/linux.sh b/hints/linux.sh
index 437e5c9..2ed31db 100644 (file)
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -39,9 +39,10 @@ d_suidsafe='undef'
 # do the implicit mapping.
 ignore_versioned_solibs='y'
 
-# BSD compatability library no longer needed
-# 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl.
-set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'`
+# BSD compatibility library no longer needed
+# 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl.
+# bind causes issues with several reentrant functions
+set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /'`
 shift
 libswanted="$*"
 
@@ -60,6 +61,11 @@ fi
 # function in <sys/stat.h>.
 d_lstat=define
 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
 # The system malloc() is about as fast and as frugal as perl's.
 # Since the system malloc() has been the default since at least
 # 5.001, we might as well leave it that way.  --AD  10 Jan 2002
@@ -80,18 +86,16 @@ case "`${cc:-cc} -V 2>&1`" in
 esac
 
 case "$optimize" in
-'') # If we have modern enough gcc and well-supported enough CPU,
-    # crank up the optimization level.
-    case "`${cc:-gcc} -v 2>&1`" in
-    *"gcc version 2.95"*|*"gcc version 3."*)
-        case "`arch 2>&1`" in
-        i?86|ppc) optimize='-O3' ;;
-        esac
+# use -O2 by default ; -O3 doesn't seem to bring significant benefits with gcc
+'')
+    optimize='-O2'
+    case "`uname -m`" in
+        ppc*)
+            # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
+           # with -O2 ; so downgrade to -O1.
+            optimize='-O1'
         ;;
     esac
-    case "$optimize" in
-    '') optimize='-O2' ;;
-    esac
     ;;
 esac