[ID 19991104.005] modified hints file for UnixWare7 ( svr5)

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

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 971dd89..5eb7e80 100644 (file)
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -58,16 +58,13 @@
 # and it is called GEM. Many of the options we are going to use depend
 # on the compiler style.
 
-# do NOT, I repeat, *NOT* take away those leading tabs
+cc=${cc:-cc}
+
+# do NOT, I repeat, *NOT* take away the leading tabs
+# Configure Black Magic (TM)
        # reset
-       _DEC_uname_r=
        _DEC_cc_style=
-       # set
-       _DEC_uname_r=`uname -r`
-       # _DEC_cc_style set soon below
-# Configure Black Magic (TM)
-
-case "$cc" in
+case "`$cc -v 2>&1 | grep cc`" in
 *gcc*) ;; # pass
 *)     # compile something small: taint.c is fine for this.
        # the main point is the '-v' flag of 'cc'.
@@ -85,7 +82,7 @@ case "$cc" in
 esac
 
 # be nauseatingly ANSI
-case "$cc" in
+case "`$cc -v 2>&1 | grep gcc`" in
 *gcc*) ccflags="$ccflags -ansi"
        ;;
 *)     ccflags="$ccflags -std"
@@ -98,7 +95,7 @@ esac
 # we want optimisation
 
 case "$optimize" in
-'')    case "$cc" in 
+'')    case "`$cc -v 2>&1 | grep gcc`" in
        *gcc*)  
                optimize='-O3'                          ;;
        *)      case "$_DEC_cc_style" in
@@ -147,13 +144,26 @@ lddlflags='-shared -expect_unresolved "*"'
 
 # Fancy compiler suites use optimising linker as well as compiler.
 # <spider@Orb.Nashua.NH.US>
-case "$_DEC_uname_r" in
+case "`uname -r`" in
 *[123].*)      # old loader
                lddlflags="$lddlflags -O3"
                ;;
-*)             lddlflags="$lddlflags $optimize -msym"
-               # -msym: If using a sufficiently recent /sbin/loader,
-               # keep the module symbols with the modules.
+*)            if $test "X$optimize" = "X$undef"; then
+                      lddlflags="$lddlflags -msym"
+              else
+                 case "`sizer -v`" in
+                 *4.0D*)
+                     # QAR 56761: -O4 + .so may produce broken code,
+                     # fixed in 4.0E or better.
+                     ;;
+                 *)    
+                      lddlflags="$lddlflags $optimize"
+                     ;;
+                 esac
+                 # -msym: If using a sufficiently recent /sbin/loader,
+                 # keep the module symbols with the modules.
+                  lddlflags="$lddlflags -msym"
+              fi
                ;;
 esac
 # Yes, the above loses if gcc does not use the system linker.
@@ -165,7 +175,7 @@ esac
 # As noted above the -DDEBUGGING is added automagically by Configure if -g.
 case "$optimize" in
        *-g*) ;; # left intentionally blank
-*)     case "$_DEC_uname_r" in
+*)     case "`uname -r`" in
        *[123].*)
                case "$useshrplib" in
                false|undef|'') lddlflags="$lddlflags -s"       ;;
@@ -177,30 +187,15 @@ case "$optimize" in
        ;;
 esac
 
-if [ "X$usethreads" = "X$define" ]; then
-    # Threads interfaces changed with V4.0.
-    case "$_DEC_uname_r" in
-    *[123].*)  libswanted="$libswanted pthreads mach exc c_r"
-               ccflags="-threads $ccflags"
-               ;;
-    *)         libswanted="$libswanted pthread exc"
-               ccflags="-pthread $ccflags"
-               ;;
-    esac
-    usemymalloc='n'
-fi
-
 #
 # Make embedding in things like INN and Apache more memory friendly.
 # Keep it overridable on the Configure command line, though, so that
 # "-Uuseshrplib" prevents this default.
 #
 
-# This or the glibpth change above breaks the build. Commented out
-# for this snapshot.
-#case "$_DEC_cc_style.$useshrplib" in
-#      new.)   useshrplib="$define"    ;;
-#esac
+case "$_DEC_cc_style.$useshrplib" in
+       new.)   useshrplib="$define"    ;;
+esac
 
 # The EFF_ONLY_OK from <sys/access.h> is present but dysfunctional for
 # [RWX]_OK as of Digital UNIX 4.0[A-D]?.  If and when this gets fixed,
@@ -209,12 +204,37 @@ fi
 
 pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
 
+# The off_t is already 8 bytes, so we do have largefileness.
+
+# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use threads.
+cat > UU/usethreads.cbu <<'EOCBU'
+case "$usethreads" in
+$define|true|[yY]*)
+       # Threads interfaces changed with V4.0.
+       case "`$cc -v 2>&1 | grep gcc`" in
+       *gcc*)ccflags="-D_REENTRANT $ccflags" ;;
+       *)  case "`uname -r`" in
+           *[123].*)   ccflags="-threads $ccflags" ;;
+           *)          ccflags="-pthread $ccflags" ;;
+           esac
+           ;;
+       esac    
+       case "`uname -r`" in
+       *[123].*) libswanted="$libswanted pthreads mach exc c_r" ;;
+       *)        libswanted="$libswanted pthread exc" ;;
+       esac
+
+        usemymalloc='n'
+       ;;
+esac
+EOCBU
+
 #
 # Unset temporary variables no more needed.
 #
 
 unset _DEC_cc_style
-unset _DEC_uname_r
     
 #
 # History: