Temporary fix for usemallocwrap problems on IRIX (was Re: usemallocwrap problems...

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

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 8cf54b1..851ac24 100644 (file)
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -225,6 +225,9 @@ libswanted="`echo $libswanted | sed -e 's/ ndbm / /'`"
 # the basic lddlflags used always
 lddlflags='-shared -expect_unresolved "*"'
 
+# Intentional leading tab.
+       myosvers="`/usr/sbin/sizer -v 2>/dev/null || uname -r`"
+
 # Fancy compiler suites use optimising linker as well as compiler.
 # <spider@Orb.Nashua.NH.US>
 case "`uname -r`" in
@@ -234,7 +237,7 @@ case "`uname -r`" in
 *)            if $test "X$optimize" = "X$undef"; then
                       lddlflags="$lddlflags -msym"
               else
-                 case "`/usr/sbin/sizer -v`" in
+                 case "$myosvers" in
                  *4.0D*)
                      # QAR 56761: -O4 + .so may produce broken code,
                      # fixed in 4.0E or better.
@@ -252,6 +255,10 @@ esac
 # Yes, the above loses if gcc does not use the system linker.
 # If that happens, let me know about it. <jhi@iki.fi>
 
+# Because there is no other handy way to recognize 3.X.
+case "`uname -r`" in
+*3.*)  ccflags="$ccflags -DDEC_OSF1_3_X" ;;
+esac
 
 # If debugging or (old systems and doing shared)
 # then do not strip the lib, otherwise, strip.
@@ -286,7 +293,7 @@ esac
 # emulate_eaccess().
 
 # Fixed in V5.0A.
-case "`/usr/sbin/sizer -v`" in
+case "$myosvers" in
 *5.0[A-Z]*|*5.[1-9]*|*[6-9].[0-9]*)
        : ok
        ;;
@@ -303,9 +310,32 @@ cat > UU/usethreads.cbu <<'EOCBU'
 # after it has prompted the user for whether to use threads.
 case "$usethreads" in
 $define|true|[yY]*)
+       # In Tru64 V5 (at least V5.1A, V5.1B) gcc (at least 3.2.2)
+       # cannot be used to compile a threaded Perl.
+       cat > pthread.c <<EOF
+#include <pthread.h>
+extern int foo;        
+EOF
+       $cc -c pthread.c 2> pthread.err
+       if grep -q "unrecognized compiler" pthread.err; then
+           cat >&4 <<EOF
+***
+*** I'm sorry but your C compiler ($cc) cannot be used to
+*** compile Perl with threads.  The system C compiler should work.
+***
+
+Cannot continue, aborting.
+
+EOF
+           rm -f pthread.*
+           exit 1
+       fi
+       rm -f pthread.*
        # Threads interfaces changed with V4.0.
        case "$isgcc" in
-       gcc)    ccflags="-D_REENTRANT $ccflags" ;;
+       gcc)
+           ccflags="-D_REENTRANT $ccflags"
+           ;;
        *)  case "`uname -r`" in
            *[123].*)   ccflags="-threads $ccflags" ;;
            *)          ccflags="-pthread $ccflags" ;;
@@ -332,12 +362,17 @@ $define|true|[yY]*)
 esac
 EOCBU
 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
 cat > UU/uselongdouble.cbu <<'EOCBU'
 # This script UU/uselongdouble.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use long doubles.
 case "$uselongdouble" in
 $define|true|[yY]*)
-       case "`/usr/sbin/sizer -v`" in
+       case "$myosvers" in
        *[1-4].0*)      cat >&4 <<EOF
 
 ***
@@ -389,7 +424,7 @@ UGLY
 esac
 EOCBU
 
-case "`/usr/sbin/sizer -v`" in
+case "$myosvers" in
 *[1-4].0*) d_modfl=undef ;; # must wait till 5.0
 esac
 
@@ -409,6 +444,10 @@ case "$LD_LIBRARY_PATH" in
 "$old_LD_LIBRARY_PATH") ;;
 *) echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4 ;;
 esac
+case "$LD_LIBRARY_PATH" in
+'') ;;
+* ) export LD_LIBRARY_PATH ;;
+esac
 
 #
 # Unset temporary variables no more needed.