[win32] integrate mainline

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

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index d2124ed..744b131 100644 (file)
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -116,24 +116,31 @@ END
 fi
 rm -f make.vers
 
+# XXX EXPERIMENTAL  A.D.  2/27/1998
+# XXX This script UU/cc.cbu will get 'called-back' by Configure after it
+# XXX has prompted the user for the C compiler to use.
+cat > UU/cc.cbu <<'EOSH'
 # If the C compiler is gcc:
 #   - check the fixed-includes
 #   - check as(1) and ld(1), they should not be GNU
+#      (GNU ad and ld 2.8.1 and later are reportedly ok, however.)
 # If the C compiler is not gcc:
 #   - check as(1) and ld(1), they should not be GNU
+#      (GNU ad and ld 2.8.1 and later are reportedly ok, however.)
 #
 # Watch out in case they have not set $cc.
-case "`${cc:-cc} -v 2>&1`" in
-*gcc*)
+
+# Get gcc to share its secrets.
+echo 'main() { return 0; }' > try.c
+verbose=`${cc:-cc} -v -o try try.c 2>&1`
+rm -f try try.c
+
+if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then
        #
        # Using gcc.
        #
        #echo Using gcc
 
-       # Get gcc to share its secrets.
-       echo 'main() { return 0; }' > try.c
-       verbose=`${cc:-cc} -v -o try try.c 2>&1`
-       rm -f try try.c
        tmp=`echo "$verbose" | grep '^Reading' |
                awk '{print $NF}'  | sed 's/specs$/include/'`
 
@@ -141,36 +148,36 @@ case "`${cc:-cc} -v 2>&1`" in
        # Doesn't work anymore for gcc-2.7.2.
 
        # See if as(1) is GNU as(1).  GNU as(1) won't work for this job.
-       case $verbose in
-       */usr/ccs/bin/as*) ;;
-       *)
+       if echo "$verbose" | grep ' /usr/ccs/bin/as ' >/dev/null 2>&1; then
+           :
+       else
            cat <<END >&2
 
 NOTE: You are using GNU as(1).  GNU as(1) will not build Perl.
-You must arrange to use /usr/ccs/bin/as, perhaps by setting
-GCC_EXEC_PREFIX or by including -B/usr/ccs/bin/ in your cc command.
+I'm arranging to use /usr/ccs/bin/as by setting including
+-B/usr/ccs/bin/ in your ${cc:-cc} command.
 (Note that the trailing "/" is required.)
 
 END
-       ;;
-       esac
+           cc="${cc:-cc} -B/usr/ccs/bin/"
+       fi
 
        # See if ld(1) is GNU ld(1).  GNU ld(1) won't work for this job.
-       case $verbose in
-       */usr/ccs/bin/ld*) ;;
-       *)
+       if echo "$verbose" | grep ' /usr/ccs/bin/as ' >/dev/null 2>&1; then
+           :
+       else
            cat <<END >&2
 
-NOTE: You are using GNU ld(1).  GNU ld(1) will not build Perl.
-You must arrange to use /usr/ccs/bin/ld, perhaps by setting
-GCC_EXEC_PREFIX or by including -B/usr/ccs/bin/ in your cc command.
+NOTE: You are using GNU as(1).  GNU as(1) will not build Perl.
+I'm arranging to use /usr/ccs/bin/as by setting including
+-B/usr/ccs/bin/ in your ${cc:-cc} command.
+(Note that the trailing "/" is required.)
 
 END
-       ;;
-       esac
+           cc="${cc:-cc} -B/usr/ccs/bin/"
+       fi
 
-       ;; #using gcc
-*)
+else
        #
        # Not using gcc.
        #
@@ -217,12 +224,41 @@ beginning of your PATH.
 END
        fi
 
-       ;; #not using gcc
-esac
+fi
 
 # as --version or ld --version might dump core.
 rm -f core
 
+# XXX
+EOSH
+
+if [ "X$usethreads" = "X$define" ]; then
+    ccflags="-D_REENTRANT $ccflags"
+    # -lpthread needs to come before -lc but after other libraries such
+    # as -lgdbm and such like. We assume here that -lc is present in
+    # libswanted. If that fails to be true in future, then this can be
+    # changed to add pthread to the very end of libswanted.
+    # sched_yield is in -lposix4
+    set `echo X "$libswanted "| sed -e 's/ c / posix4 pthread c /'`
+    shift
+    libswanted="$*"
+
+    # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp()
+    # when linked with the threads library, such that whatever positive value
+    # you pass to siglongjmp(), sigsetjmp() returns 1.
+    # Thanks to Simon Parsons <S.Parsons@ftel.co.uk> for this report.
+    if test "`arch`" = i86pc -a "$osvers" = 2.6; then
+       d_sigaction=$undef
+       cat << 'EOM' >&2
+
+You will see a *** WHOA THERE!!! ***  message from Configure for
+d_sigaction.  Keep the recommended value.  See hints/solaris_2.sh
+for more information.
+
+EOM
+    fi
+fi
+
 # This is just a trick to include some useful notes.
 cat > /dev/null <<'End_of_Solaris_Notes'