Integrate mainline 5.05_61

p4raw-id: //depot/vmsperl@4084

5 files changed, 48 insertions, 23 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index 9b155e7bdf..5a027b3837 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -174,34 +174,46 @@ EOCBU
 cat > UU/use64bits.cbu <<'EOCBU'
 case "$use64bits" in
 $define|true|[yY]*)
-	    case "`uname -r`" in
+	    case "`oslevel`" in
 	    3.*|4.[012].*)
 		cat >&4 <<EOM
-AIX `uname -r` does not support 64-bit interfaces.
-You should upgrade to at least AIX 4.3.
+AIX `oslevel` does not support 64-bit interfaces.
+You should upgrade to at least AIX 4.2.
 EOM
 		exit 1
 		;;
 	    esac
-	    ccflags="$ccflags `getconf XBS5_LPBIG_OFFBIG_CFLAGS`"
     	    ccflags="$ccflags -DUSE_LONG_LONG"
+	    ccflags="$ccflags `getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
 
-	    ldflags="$ldflags `getconf XBS5_LPBIG_OFFBIG_LDFLAGS`"
+	    ldflags="$ldflags `getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
 	    # _Somehow_ in AIX 4.3.1.0 the above getconf call manages to
 	    # insert(?) *something* to $ldflags so that later (in Configure) evaluating
 	    # $ldflags causes a newline after the '-b64' (the result of the getconf).
+	    # (nothing strange shows up in $ldflags even in hexdump;
+	    #  so it may be something in the shell, instead?)
 	    # Try it out: just uncomment the below line and rerun Configure:
 #	    echo >& "AIX $ldflags mystery" ; exit 1
 	    # Just don't ask me how AIX does it.
-	    # Therefore the line re-evaluating ldflags: it seems to drop the whatever
-	    # AIX managed to break. --jhi
+	    # Therefore the line re-evaluating ldflags: it seems to bypass
+	    # the whatever it was AIX managed to break. --jhi
 	    ldflags="`echo $ldflags`"
 
-	    libswanted="$libswanted `getconf XBS5_LPBIG_OFFBIG_LIBS|sed -e 's@^-l@@' -e 's@ -l@ @g'`"
+	    libswanted="$libswanted `getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`"
 	    # When a 64-bit cc becomes available $archname64
 	    # may need setting so that $archname gets it attached.
 	    ;;
 esac
 EOCBU
 
+# This script UU/uselongdouble.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use long doubles.
+cat > UU/uselongdouble.cbu <<'EOCBU'
+case "$uselongdouble" in
+$define|true|[yY]*)
+	ccflags="$ccflags -qlongdouble"
+	;;
+esac
+EOCBU
+
 # EOF
diff --git a/hints/cygwin.sh b/hints/cygwin.sh
index e6d466bfda..23d055faa6 100644
--- a/hints/cygwin.sh
+++ b/hints/cygwin.sh
@@ -25,6 +25,7 @@ lddlflags='-L/usr/local/lib'
 useshrplib='true'
 libperl='libperl.a'
 dlext='dll'
+dynamic_ext=' '
 
 man1dir=/usr/local/man/man1
 man3dir=/usr/local/man/man3
diff --git a/hints/hpux.sh b/hints/hpux.sh
index 8240b3ed2c..eb9b6856e7 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -268,14 +268,15 @@ Cannot continue, aborting.
 EOM
 		exit 1
 	    fi
-	    if [ ! -d /lib/pa20_64 ]; then
+	    if [ ! -f /lib/pa20_64/libc.sl ]; then
 		cat <<EOM >&4
-You do not seem to have the 64-bit libraries, /lib/pa20_64.
+You do not seem to have the 64-bit libraries in /lib/pa20_64.
+Most importantly, I cannot find /lib/pa20_64/libc.sl.
 Cannot continue, aborting.
 EOM
 		exit 1
 	    fi
-	    ccflags="$ccflags +DD64 -D_FILE_OFFSET_BITS=64"
+	    ccflags="$ccflags +DD64 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 	    ldflags="$ldflags +DD64"
 	    ld=/usr/bin/ld
 	    set `echo " $libswanted " | sed -e 's@ dl @ @'`
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 1b032cdb70..cab48b45ae 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -126,7 +126,10 @@ malloc_cflags='ccflags="-DSTRICT_ALIGNMENT $ccflags"'
 	# and returning small structures.  This affects inet_*() and semctl().
 	# See http://reality.sgi.com/ariel/freeware/gcc-2.8.1-notes.html
 	# for more information.  Reported by Lionel Cons <lionel.cons@cern.ch>.
-	IRIX64) ccflags="$ccflags -mabi=64" ;;
+	IRIX64)	ccflags="$ccflags -mabi=64"
+		ldflags="$ldflags -mabi=64 -L/usr/lib64"
+		lddlflags="$lddlflags -mabi=64"
+		;;
 	esac
 	;;
 *)
@@ -137,6 +140,9 @@ malloc_cflags='ccflags="-DSTRICT_ALIGNMENT $ccflags"'
 	;;
 esac
 
+# Don't groan about unused libraries.
+ldflags="$ldflags -Wl,-woff,84"
+
 # We don't want these libraries.
 # Socket networking is in libc, these are not installed by default,
 # and just slow perl down. (scotth@sgi.com)
@@ -237,19 +243,9 @@ EOM
 	    *-n32*)
 		ccflags="$ccflags -DUSE_LONG_LONG"
 		archname64="-n32"
-		d_open64="$undef"
-		# In -n32 mode (ILP32LL64) we use the standard open().
-		# In -64 we will use the open64().
-		cat << 'EOM' >&2
-
-You will see a *** WHOA THERE!!! ***  message from Configure for
-d_open64.  Keep the recommended value.  See hints/irix6.sh
-for more information.
-
-EOM
 		;;
 	    esac
-	    ccflags="$ccflags -DUSE_64_BIT_FILES"
+	    ccflags="$ccflags -DUSE_64_BITS"
 	    ;;
 esac
 EOCBU
diff --git a/hints/machten.sh b/hints/machten.sh
index 767283792b..cc663a9efb 100644
--- a/hints/machten.sh
+++ b/hints/machten.sh
@@ -13,6 +13,9 @@
 #	Martijn Koster <m.koster@webcrawler.com>
 #	Richard Yeh <rcyeh@cco.caltech.edu>
 #
+# Disable shadow password file access: MT 4.1.1 has necessary library
+# functions, but not header file (or documentation)
+#                      -- Dominic Dunlop <domo@computer.org> 990804
 # For now, explicitly disable dynamic loading -- MT 4.1.1 has it,
 # but these hints do not yet support it.
 # Define NOTEDEF_MACHTEN to undo gratuitous Tenon hack to signal.h.
@@ -36,6 +39,13 @@
 #
 # Comments, questions, and improvements welcome!
 #
+# MachTen 4.1.1's support for shadow password file access is incomplete:
+# disable its use completely.
+d_endspent=${d_endspent:-undef}
+d_getspent=${d_getspent:-undef}
+d_getspnam=${d_getspnam:-undef}
+d_setspent=${d_setspent:-undef}
+
 # MachTen 4.1.1 does support dynamic loading, but perl doesn't
 # know how to use it yet.
 usedl=${usedl:-undef}
@@ -191,6 +201,11 @@ Similarly, when you see
 select the default answer: vfork() works, and avoids expensive data
 copying.
 
+You may also see "WHOA THERE!!!" messages concerning \$d_endspent,
+\$d_getspent, \$d_getspnam and \$d_setspent.  In all cases, select the
+default answer: MachTen's support for shadow password file access is
+incomplete, and should not be used.
+
 At the end of Configure, you will see a harmless message
 
 Hmm...You had some extra variables I don't know about...I'll try to keep 'em.