Turn on largefileness always if available and

continue 64-bit fixes.

p4raw-id: //depot/cfgperl@4552

5 files changed, 64 insertions, 20 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index 5fd75471d8..d905be1d17 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -180,6 +180,32 @@ EOM
 esac
 EOCBU
 
+# Turn on largefileness, if available.
+	lfcflags="`getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
+	lfldflags="`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 >&4 "AIX 4.3.1.0 $lfldflags mystery" ; exit 1
+	# Just don't ask me how AIX does it, I spent hours wondering.
+	# Therefore the line re-evaluating lfldflags: it seems to fix
+	# the whatever it was that AIX managed to break. --jhi
+	lfldflags="`echo $lfldflags`"
+	lflibs="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+case "$lfcflags$lfldflags$lflibs" in
+'');;
+*) ccflags="$ccflags $lfcflags"
+   ldflags="$ldflags $ldldflags"
+   libswanted="$libswanted $lflibs"
+   ;;
+esac
+	lfcflags=''
+	lfldflags=''
+	lflibs=''
+
 # This script UU/use64bits.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bits.cbu <<'EOCBU'
@@ -198,22 +224,6 @@ EOM
 	    *-DUSE_LONG_LONG*) ;;
 	    *) ccflags="$ccflags -DUSE_LONG_LONG" ;;
 	    esac
-	    ccflags="$ccflags `getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
-
-	    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 >&4 "AIX 4.3.1.0 $ldflags mystery" ; exit 1
-	    # Just don't ask me how AIX does it.
-	    # Therefore the line re-evaluating ldflags: it seems to bypass
-	    # the whatever it was that AIX managed to break. --jhi
-	    ldflags="`echo $ldflags`"
-
-	    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.
 	    ;;
diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 3c3b00caa5..5eb7e80968 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -204,6 +204,8 @@ esac
 
 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'
diff --git a/hints/hpux.sh b/hints/hpux.sh
index add4410cd5..681a722cb7 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -290,6 +290,21 @@ EOM
 esac
 EOCBU
 
+# Turn on largefileness if available.
+	lfcflags="`getconf _CS_XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
+	lfldflags="`getconf _CS_XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
+	lflibs="`getconf _CS_XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+case "$lfcflags$lfldflags$lflibs" in
+'');;
+*) ccflags="$ccflags $lfcflags"
+   ldflags="$ldflags $ldldflags"
+   libswanted="$libswanted $lflibs"
+   ;;
+esac
+	lfcflags=''
+	lfldflags=''
+	lflibs=''
+
 # This script UU/use64bits.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bits.cbu <<'EOCBU'
@@ -311,7 +326,7 @@ Cannot continue, aborting.
 EOM
 		exit 1
 	    fi
-	    ccflags="$ccflags +DD64 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+	    ccflags="$ccflags +DD64"
 	    ldflags="$ldflags +DD64"
 	    ld=/usr/bin/ld
 	    set `echo " $libswanted " | sed -e 's@ dl @ @'`
@@ -319,3 +334,6 @@ EOM
 	    glibpth="/lib/pa20_64"
 esac
 EOCBU
+
+
+
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 488c6bb0ae..f4bbf32d01 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -226,6 +226,8 @@ EOM
 esac
 EOCBU
 
+# The -n32 makes off_t to be 8 bytes, so we should have largefileness.
+
 # This script UU/use64bits.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bits.cbu <<'EOCBU'
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 050cacc699..a5d033b946 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -333,6 +333,21 @@ EOM
 esac
 EOCBU
 
+# Turn on largefileness if available.
+	lfcflags="`getconf LFS_CFLAGS 2>/dev/null`"
+	lfldflags="`getconf LFS_LDFLAGS 2>/dev/null`"
+	lflibs="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+case "$lfcflags$lfldflags$lflibs" in
+'');;
+*) ccflags="$ccflags $lfcflags"
+   ldflags="$ldflags $ldldflags"
+   libswanted="$libswanted $lflibs"
+   ;;
+esac
+	lfcflags=''
+	lfldflags=''
+	lflibs=''
+
 # This script UU/use64bits.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bits.cbu <<'EOCBU'
@@ -347,9 +362,6 @@ EOM
 		exit 1
 		;;
 	    esac
-	    ccflags="$ccflags `getconf LFS_CFLAGS`"
-	    ldflags="$ldflags `getconf LFS_LDFLAGS`"
-	    libswanted="$libswanted `getconf LFS_LIBS`"
 	    case "$ccflags" in
 	    *-DUSE_LONG_LONG*) ;;
 	    *) ccflags="$ccflags -DUSE_LONG_LONG" ;;