X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=config;h=b9d1c7aa26885853ec6a11a3b9e9638ba639e481;hb=8ea45317187ab9fbecefd9b9b231993c2c1554b6;hp=82c57efb7c9284d757e1435393b93e6e66e17d85;hpb=d3205a48981a1f534d5d6ba8042733ef9238da90;p=oweals%2Fopenssl.git diff --git a/config b/config index 82c57efb7c..b9d1c7aa26 100755 --- a/config +++ b/config @@ -29,7 +29,7 @@ EXE="" for i do case "$i" in --d*) PREFIX="debug-";; +-d) PREFIX="debug-";; -t*) TEST="true";; -h*) TEST="true"; cat </dev/null` || MACHINE="unknown" -RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" -SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" -VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" +[ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" +[ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" +[ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" +[ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" # Now test for ISC and SCO, since it is has a braindamaged uname. @@ -399,21 +399,27 @@ exit 0 # this is where the translation occurs into SSLeay terms # --------------------------------------------------------------------------- -# figure out if gcc is available and if so we use it otherwise -# we fallback to whatever cc does on the system GCCVER=`(gcc -dumpversion) 2>/dev/null` if [ "$GCCVER" != "" ]; then - CC=gcc # then strip off whatever prefix egcs prepends the number with... # Hopefully, this will work for any future prefixes as well. - GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'` + GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'` # Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion # does give us what we want though, so we use that. We just just the # major and minor version numbers. # peak single digit before and after first dot, e.g. 2.95.1 gives 29 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` -else - CC=cc +fi + +# Only set CC if not supplied already +if [ -z "$CC" ]; then +# figure out if gcc is available and if so we use it otherwise +# we fallback to whatever cc does on the system + if [ "$GCCVER" != "" ]; then + CC=gcc + else + CC=cc + fi fi GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then @@ -585,23 +591,27 @@ case "$GUESSOS" in OUT="linux-generic32" ;; arm*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; arm*l-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; - s390*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN -DNO_ASM" ;; + sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; + sh*-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; + m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; + s390-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN -DNO_ASM" ;; + s390x-*-linux2) OUT="linux-generic64"; options="$options -DB_ENDIAN" ;; x86_64-*-linux?) OUT="linux-x86_64" ;; *86-*-linux2) OUT="linux-elf" if [ "$GCCVER" -gt 28 ]; then if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then - options="$options -mcpu=pentium" + options="$options -march=pentium" fi if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then - options="$options -mcpu=pentiumpro" + options="$options -march=pentiumpro" fi if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then - options="$options -mcpu=k6" + options="$options -march=k6" fi fi ;; *-*-linux1) OUT="linux-aout" ;; *-*-linux2) OUT="linux-generic32" ;; - sun4u*-*-solaris2) + sun4[uv]*-*-solaris2) OUT="solaris-sparcv9-$CC" ISA64=`(isalist) 2>/dev/null | grep sparcv9` if [ "$ISA64" != "" ]; then @@ -652,8 +662,8 @@ case "$GUESSOS" in *-*-sunos4) OUT="sunos-$CC" ;; *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;; - alpha*-*-*bsd*) OUT="BSD-generic64; options="$options -DL_ENDIAN" ;; - powerpc64-*-*bsd*) OUT="BSD-generic64; options="$options -DB_ENDIAN" ;; + alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;; + powerpc64-*-*bsd*) OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;; sparc64-*-*bsd*) OUT="BSD-sparc64" ;; ia64-*-*bsd*) OUT="BSD-ia64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; @@ -717,9 +727,9 @@ case "$GUESSOS" in fi fi elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU - OUT="hpux-parisc-${CC} + OUT="hpux-parisc-${CC}" elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU - OUT="hpux-parisc-${CC} + OUT="hpux-parisc-${CC}" else # Motorola(?) CPU OUT="hpux-$CC" fi @@ -731,6 +741,10 @@ case "$GUESSOS" in OBJECT_MODE=${OBJECT_MODE:-32} if [ "$CC" = "gcc" ]; then OUT="aix-gcc" + if [ $OBJECT_MODE -eq 64 ]; then + echo 'Your $OBJECT_MODE was found to be set to 64' + OUT="aix64-gcc" + fi elif [ $OBJECT_MODE -eq 64 ]; then echo 'Your $OBJECT_MODE was found to be set to 64' OUT="aix64-cc" @@ -745,7 +759,7 @@ case "$GUESSOS" in fi fi fi - if (lsattr -E -O -l proc0 | grep -i powerpc) >/dev/null 2>&1; then + if (lsattr -E -O -l `lsdev -c processor|awk '{print$1;exit}'` | grep -i powerpc) >/dev/null 2>&1; then : # this applies even to Power3 and later, as they return PowerPC_POWER[345] else options="$options no-asm" @@ -759,6 +773,8 @@ case "$GUESSOS" in t3e-cray-unicosmk) OUT="cray-t3e" ;; j90-cray-unicos) OUT="cray-j90" ;; nsr-tandem-nsk) OUT="tandem-c89" ;; + x86pc-*-qnx6) OUT="QNX6-i386" ;; + *-*-qnx6) OUT="QNX6" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac @@ -774,7 +790,7 @@ esac # options="$options -DATALLA" #fi -# gcc < 2.8 does not support -mcpu=ultrasparc +# gcc < 2.8 does not support -march=ultrasparc if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] then echo "WARNING! Falling down to 'solaris-sparcv8-gcc'." @@ -794,7 +810,7 @@ case "$GUESSOS" in i386-*) options="$options 386" ;; esac -for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha +for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha do if [ ! -d crypto/$i ] then