[PATCH 5.004_62} Config_62-01 patch available.

Date: Mon, 9 Mar 1998 15:23:33 -0500 (EST)
Subject: [PATCH 5.004_62] Tiny hint file updates
Date: Mon, 9 Mar 1998 13:21:46 -0500 (EST)

p4raw-id: //depot/perl@812

9 files changed, 41 insertions, 13 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index bc26590291..a29466e4f8 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -71,7 +71,7 @@ lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).
 ;;
 esac
 
-if [ "X$usethreads" != "X" ]; then
+if [ "X$usethreads" = "X$define" ]; then
     ccflags="-DNEED_PTHREAD_INIT $ccflags"
     case "$cc" in
     xlc_r | cc_r)
diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index ae49f503a0..5055302353 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -180,7 +180,7 @@ case "$optimize" in
     	;;
 esac
 
-if [ "X$usethreads" != "X" ]; then
+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"
diff --git a/hints/dos_djgpp.sh b/hints/dos_djgpp.sh
index 9878cc33fc..1b4a845fc2 100644
--- a/hints/dos_djgpp.sh
+++ b/hints/dos_djgpp.sh
@@ -66,7 +66,7 @@ esac
 exec tr.exe "\$@"
 EOSC
 
-if [ "X$usethreads" != "X" ]; then
+if [ "X$usethreads" = "X$define" ]; then
     set `echo X "$libswanted "| sed -e 's/ c / gthreads c /'`
     shift
     libswanted="$*"
diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 5e89d56039..f1bbd60457 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -17,7 +17,12 @@
 # Additional 2.2 defines from
 # Mark Murray <mark@grondar.za>
 # Date: Wed, 6 Nov 1996 09:44:58 +0200 (MET)
-# 
+#
+# Modified to ensure we replace -lc with -lc_r, and
+# to put in place-holders for various specific hints.
+# Andy Dougherty <doughera@lafcol.lafayette.edu>
+# Date: Tue Mar 10 16:07:00 EST 1998
+#
 # The two flags "-fpic -DPIC" are used to indicate a
 # will-be-shared object.  Configure will guess the -fpic, (and the
 # -DPIC is not used by perl proper) but the full define is included to 
@@ -104,9 +109,14 @@ problem.  Try
 
 EOM
 
-if [ "X$usethreads" != "X" ]; then
+# XXX EXPERIMENTAL  A.D.  03/09/1998
+# XXX This script UU/usethreads.cbu will get 'called-back' by Configure
+# XXX after it has prompted the user for whether to use threads.
+cat > UU/usethreads.cbu <<'EOSH'
+case "$usethreads" in
+$define)
     if [ ! -r /usr/lib/libc_r.a ]; then
-        cat <<'EOM'
+        cat <<'EOM' >&4
 
 The re-entrant C library /usr/lib/libc_r.a does not exist; cannot build
 threaded Perl.  Consider upgrading to a newer FreeBSD snapshot or release:
@@ -115,5 +125,23 @@ at least the FreeBSD 3.0-971225-SNAP is known to have the libc_r.a.
 EOM
         exit 1
     fi
-    libswanted="$libswanted c_r"
-fi
+    # Patches to libc_r may be required.
+    # Print out a note about them here.
+
+    # These checks by Andy Dougherty <doughera@lafcol.lafayette.edu>
+    # Please update or change them as you learn more!
+    # -lc_r must REPLACE -lc.  AD  03/10/1998
+    set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
+    shift
+    libswanted="$*"
+    # Configure will probably pick the wrong libc to use for nm scan.
+    # The safest quick-fix is just to not use nm at all.
+    usenm=false
+    # Is vfork buggy in 3.0?
+    case "$osvers" in
+	3.0) usevfork=false ;;
+    esac
+    ;;
+esac
+EOSH
+# XXX EXPERIMENTAL  --end of call-back
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 3d8202a8ae..ed3c112ffa 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -117,7 +117,7 @@ libswanted="$*"
 # makes IRIX 6.2 cc to emit bad code.
 pp_ctl_cflags='optimize=-O'
 
-if [ "X$usethreads" != "X" ]; then
+if [ "X$usethreads" = "X$define" ]; then
     if test ! -f /usr/include/pthread.h -o ! -f /usr/lib/libpthread.so; then
 	uname_r=`uname -r`
 	case "`uname -r`" in
diff --git a/hints/irix_6_0.sh b/hints/irix_6_0.sh
index e76890d120..b0a39943bd 100644
--- a/hints/irix_6_0.sh
+++ b/hints/irix_6_0.sh
@@ -42,7 +42,7 @@ libswanted="$*"
 # shift
 # libswanted="$*"
 
-if [ "X$usethreads" != "X" ]; then
+if [ "X$usethreads" = "X$define" ]; then
     echo >&4 "IRIX 6.0 does not have POSIX threads."
     echo >&4 "You should upgrade to at least IRIX 6.3."
     echo >&4 "Cannot continue, aborting."
diff --git a/hints/irix_6_1.sh b/hints/irix_6_1.sh
index 91c3ef8cf8..1c54f774a9 100644
--- a/hints/irix_6_1.sh
+++ b/hints/irix_6_1.sh
@@ -42,7 +42,7 @@ libswanted="$*"
 # shift
 # libswanted="$*"
 
-if [ "X$usethreads" != "X" ]; then
+if [ "X$usethreads" = "X$define" ]; then
     echo >&4 "IRIX 6.1 does not have POSIX threads."
     echo >&4 "You should upgrade to at least IRIX 6.3."
     echo >&4 "Cannot continue, aborting."
diff --git a/hints/os2.sh b/hints/os2.sh
index 7cda0bf89b..f11eeb36ed 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -245,7 +245,7 @@ case "X$optimize" in
 	;;
 esac
 
-if [ "X$usethreads" != "X" ]; then
+if [ "X$usethreads" = "X$define" ]; then
     ccflags="-Zmt $ccflags"
     cppflags="-Zmt $cppflags"  # Do we really need to set this?
     aout_ccflags="-DUSE_THREADS $aout_ccflags"
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 7f7a85680c..047e4cf3b7 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -230,7 +230,7 @@ rm -f core
 # XXX
 EOSH
 
-if [ "X$usethreads" != "X" ]; then
+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