diff options
Diffstat (limited to 'hints')
| -rw-r--r-- | hints/aix.sh | 8 | ||||
| -rw-r--r-- | hints/hpux.sh | 4 | ||||
| -rw-r--r-- | hints/irix_4.sh | 4 | ||||
| -rw-r--r-- | hints/irix_5.sh | 4 | ||||
| -rw-r--r-- | hints/irix_6.sh | 6 | ||||
| -rw-r--r-- | hints/irix_6_0.sh | 4 | ||||
| -rw-r--r-- | hints/irix_6_1.sh | 5 | ||||
| -rw-r--r-- | hints/solaris_2.sh | 14 |
8 files changed, 23 insertions, 26 deletions
diff --git a/hints/aix.sh b/hints/aix.sh index 4addec6e0c..1029a36aea 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -179,7 +179,7 @@ EOCBU # after it has prompted the user for whether to use large files. cat > UU/uselfs.cbu <<'EOCBU' case "$uselargefiles" in -$define|true|[yY]*) +''|$define|true|[yY]*) 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 @@ -208,10 +208,10 @@ $define|true|[yY]*) esac EOCBU -# This script UU/use64bits.cbu will get 'called-back' by Configure +# This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64 bits. -cat > UU/use64bits.cbu <<'EOCBU' -case "$use64bits" in +cat > UU/use64bitint.cbu <<'EOCBU' +case "$use64bitint" in $define|true|[yY]*) case "`oslevel`" in 3.*|4.[012].*) diff --git a/hints/hpux.sh b/hints/hpux.sh index ad213f2d99..ba6efa0341 100644 --- a/hints/hpux.sh +++ b/hints/hpux.sh @@ -133,7 +133,7 @@ else selecttype='int *' fi -case "$use64bits" in +case "$use64bitint" in $define|true|[yY]*) if [ "$xxOsRevMajor" -lt 11 ]; then cat <<EOM >&4 @@ -349,7 +349,7 @@ EOCBU # after it has prompted the user for whether to use 64 bits. cat > UU/uselfs.cbu <<'EOCBU' case "$uselargefiles" in -$define|true|[yY]*) +''|$define|true|[yY]*) # there are largefile flags available via getconf(1) # but we cheat for now. ccflags="$ccflags -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/hints/irix_4.sh b/hints/irix_4.sh index 1e90f989bd..5c5bdb2f0d 100644 --- a/hints/irix_4.sh +++ b/hints/irix_4.sh @@ -33,8 +33,8 @@ EOM ;; esac -case "$use64bits" in -$define|true|[yY]*) +case " $use64bits $use64bitint $use64bitall " in +*" $define "*|*" true "*|*" [yY] "*) cat >&4 <<EOM IRIX `uname -r` does not support 64-bit types. You should upgrade to at least IRIX 6.2. diff --git a/hints/irix_5.sh b/hints/irix_5.sh index 30f11d7676..f895bcc5f6 100644 --- a/hints/irix_5.sh +++ b/hints/irix_5.sh @@ -43,8 +43,8 @@ EOM ;; esac -case "$use64bits" in -$define|true|[yY]*) +case " $use64bits $use64bitint $use64bitall " in +*" $define "*|*" true "*|*" [yY] "*) cat >&4 <<EOM IRIX `uname -r` does not support 64-bit types. You should upgrade to at least IRIX 6.2. diff --git a/hints/irix_6.sh b/hints/irix_6.sh index 8dc3cba1d2..b512609280 100644 --- a/hints/irix_6.sh +++ b/hints/irix_6.sh @@ -233,10 +233,10 @@ 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 +# This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64 bits. -cat > UU/use64bits.cbu <<'EOCBU' -case "$use64bits" in +cat > UU/use64bitint.cbu <<'EOCBU' +case "$use64bitint" in $define|true|[yY]*) case "`uname -r`" in [1-5]*|6.[01]) diff --git a/hints/irix_6_0.sh b/hints/irix_6_0.sh index b34b3ecaff..50498af718 100644 --- a/hints/irix_6_0.sh +++ b/hints/irix_6_0.sh @@ -52,8 +52,8 @@ EOM ;; esac -case "$use64bits" in -$define|true|[yY]*) +case " $use64bits $use64bitint $use64bitall " in +*" $define "*|*" true "*|*" [yY] "*) cat >&4 <<EOM IRIX `uname -r` does not support 64-bit types. You should upgrade to at least IRIX 6.2. diff --git a/hints/irix_6_1.sh b/hints/irix_6_1.sh index 3359639818..50498af718 100644 --- a/hints/irix_6_1.sh +++ b/hints/irix_6_1.sh @@ -52,8 +52,8 @@ EOM ;; esac -case "$use64bits" in -$define|true|[yY]*) +case " $use64bits $use64bitint $use64bitall " in +*" $define "*|*" true "*|*" [yY] "*) cat >&4 <<EOM IRIX `uname -r` does not support 64-bit types. You should upgrade to at least IRIX 6.2. @@ -61,3 +61,4 @@ Cannot continue, aborting. EOM exit 1 esac + diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index dc11d82621..203257bee3 100644 --- a/hints/solaris_2.sh +++ b/hints/solaris_2.sh @@ -334,17 +334,17 @@ esac EOCBU case "$uselargefiles" in -$define|true|[yY]*) +''|$define|true|[yY]*) ccflags="$ccflags `getconf LFS_CFLAGS 2>/dev/null`" ldflags="$ldflags `getconf LFS_LDFLAGS 2>/dev/null`" libswanted="$libswanted `getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`" ;; esac -# This script UU/use64bits.cbu will get 'called-back' by Configure +# This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64 bits. -cat > UU/use64bits.cbu <<'EOCBU' -case "$use64bits" in +cat > UU/use64bitint.cbu <<'EOCBU' +case "$use64bitint" in $define|true|[yY]*) case "`uname -r`" in 2.[1-6]) @@ -361,12 +361,8 @@ EOM esac EOCBU -case "$usefull64bits" in +case "$use64bitall" in $define|true|[yY]*) - case "$ccflags" in - *-DUSE_FULL_64_BITS*) ;; - *) ccflags="$ccflags -DUSE_FULL_64_BITS" ;; - esac ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS`" ldflags="$ccflags `getconf XBS5_LP64_OFF64_LDFLAGS`" lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS`" |