# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1343856395 -7200
# Node ID aa0488214e356fac81d66ddb73cdcdca805dff09
# Parent  127559aa0c5e8ee08b256039830d1d081b55c542
Correct defective suffix and platform detection in small config script.

diff -r 127559aa0c5e -r aa0488214e35 openpkg/openssl.patch
--- a/openpkg/openssl.patch	Wed Aug 01 23:24:50 2012 +0200
+++ b/openpkg/openssl.patch	Wed Aug 01 23:26:35 2012 +0200
@@ -84,22 +84,25 @@
    if [ "$GCCVER" != "" ]; then
      # then strip off whatever prefix egcs prepends the number with...
      # Hopefully, this will work for any future prefixes as well.
-@@ -424,8 +427,14 @@
+@@ -424,8 +427,17 @@
      # 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/'`
      CC=gcc
 +    SUFFIX=gcc
-   else
-     CC=cc
++  else
++    CC=cc
 +    SUFFIX=cc
 +  fi
 +else
 +  if [ "$GCCVER" != "" ]; then
 +    SUFFIX=gcc
+   else
+     CC=cc
++    SUFFIX=cc
    fi
  fi
  GCCVER=${GCCVER:-0}
-@@ -435,7 +444,7 @@
+@@ -435,7 +447,7 @@
    if [ $GCCVER -ge 30 ]; then
      # PA64 support only came in with gcc 3.0.x.
      # We check if the preprocessor symbol __LP64__ is defined...
@@ -108,7 +111,7 @@
        : # __LP64__ has slipped through, it therefore is not defined
      else
        GCC_BITS="64"
-@@ -446,13 +455,14 @@
+@@ -446,13 +458,14 @@
    if [ $GCCVER -ge 30 ]; then
      # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
      # to be working, at the very least 'make test' passes...
@@ -124,7 +127,7 @@
    CCVER=`(cc -V 2>&1) 2>/dev/null | \
    	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
  	sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
-@@ -465,6 +475,7 @@
+@@ -465,6 +478,7 @@
        sleep 5
      fi
    fi
@@ -132,7 +135,7 @@
  fi
  
  if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
-@@ -482,6 +493,7 @@
+@@ -482,6 +496,7 @@
  
  if [ "${SYSTEM}" = "AIX" ]; then	# favor vendor cc over gcc
      (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
@@ -140,7 +143,7 @@
  fi
  
  CCVER=${CCVER:-0}
-@@ -507,7 +519,7 @@
+@@ -507,7 +522,7 @@
  	if [ $CPU -ge 4000 ]; then
  		options="$options -mips2"
  	fi
@@ -149,7 +152,7 @@
  	;;
    mips3-sgi-irix)
  	#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
-@@ -517,11 +529,11 @@
+@@ -517,11 +532,11 @@
  	#else
  	#	options="$options -mips3"
  	#fi
@@ -163,7 +166,7 @@
  	if [ "$TEST" = "false" -a -t 1 ]; then
  	  echo "         You have about 5 seconds to press Ctrl-C to abort."
  	  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
-@@ -533,7 +545,7 @@
+@@ -533,7 +548,7 @@
          #else
          #        options="$options -mips3"
          #fi
@@ -172,7 +175,7 @@
  	;;
    ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
    ppc-apple-darwin*)
-@@ -566,6 +578,9 @@
+@@ -566,6 +581,9 @@
  	else
  	    OUT="darwin-i386-cc"
  	fi ;;
@@ -182,7 +185,7 @@
    armv6+7-*-iphoneos)
  	options="$options -arch%20armv6 -arch%20armv7"
  	OUT="iphoneos-cross" ;;
-@@ -575,10 +590,10 @@
+@@ -575,10 +593,10 @@
    alpha-*-linux2)
          ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
  	case ${ISA:-generic} in
@@ -196,7 +199,7 @@
  	    case ${ISA:-generic} in
  	    EV5|EV45)		options="$options -mcpu=ev5";;
  	    EV56|PCA56)		options="$options -mcpu=ev56";;
-@@ -662,7 +677,7 @@
+@@ -662,7 +680,7 @@
  	;;
    x86_64-*-linux?) OUT="linux-x86_64" ;;
    *86-*-linux2) OUT="linux-elf"
@@ -205,7 +208,7 @@
            if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
  	    options="$options -march=pentium"
            fi
-@@ -676,17 +691,17 @@
+@@ -676,17 +694,17 @@
    *-*-linux1) OUT="linux-aout" ;;
    *-*-linux2) OUT="linux-generic32" ;;
    sun4[uv]*-*-solaris2)
@@ -226,7 +229,7 @@
  		# $GCC_ARCH denotes default ABI chosen by compiler driver
  		# (first one found on the $PATH). I assume that user
  		# expects certain consistency with the rest of his builds
-@@ -712,21 +727,21 @@
+@@ -712,21 +730,21 @@
  	    OUT="solaris64-sparcv9-$CC"
  	fi
  	;;
@@ -238,9 +241,8 @@
 +  sun4*-*-solaris2)	OUT="solaris-sparcv7-$SUFFIX" ;;
    *86*-*-solaris2)
  	ISA64=`(isalist) 2>/dev/null | grep amd64`
--	if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
+ 	if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
 -	    OUT="solaris64-x86_64-$CC"
-+	if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
 +	    OUT="solaris64-x86_64-$SUFFIX"
  	else
 -	    OUT="solaris-x86-$CC"
@@ -255,7 +257,7 @@
  
    *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
    alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
-@@ -750,7 +765,7 @@
+@@ -750,7 +768,7 @@
    *-*-osf)		OUT="osf1-alpha-cc" ;;
    *-*-tru64)		OUT="tru64-alpha-cc" ;;
    *-*-[Uu]nix[Ww]are7)
@@ -264,7 +266,7 @@
  	  OUT="unixware-7-gcc" ; options="$options no-sse2"
  	else    
  	  OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
-@@ -761,12 +776,12 @@
+@@ -761,12 +779,12 @@
    *-*-vos)
  	options="$options no-threads no-shared no-asm no-dso"
  	EXE=".pm"
@@ -279,7 +281,7 @@
  	    OUT="hpux64-parisc2-gcc"
  	fi
  	[ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
-@@ -781,8 +796,8 @@
+@@ -781,8 +799,8 @@
  	        OUT="hpux-ia64-cc"
               fi
  	elif [ $CPU_VERSION -ge 532 ]; then	# PA-RISC 2.x CPU
@@ -290,7 +292,7 @@
  		echo "WARNING! If you wish to build 64-bit library then you have to"
  		echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
  		if [ "$TEST" = "false" -a -t 1 ]; then
-@@ -791,9 +806,9 @@
+@@ -791,9 +809,9 @@
  		fi
  	     fi
  	elif [ $CPU_VERSION -ge 528 ]; then	# PA-RISC 1.1+ CPU
@@ -302,7 +304,7 @@
  	else					# Motorola(?) CPU
  	     OUT="hpux-$CC"
  	fi
-@@ -803,7 +818,7 @@
+@@ -803,7 +821,7 @@
  	[ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
  	KERNEL_BITS=${KERNEL_BITS:-32}
  	OBJECT_MODE=${OBJECT_MODE:-32}
@@ -311,7 +313,7 @@
  	    OUT="aix-gcc"
            if [ $OBJECT_MODE -eq 64 ]; then
              echo 'Your $OBJECT_MODE was found to be set to 64'
-@@ -913,7 +928,7 @@
+@@ -913,7 +931,7 @@
  #fi
  
  if [ -z "$OUT" ]; then
@@ -320,7 +322,7 @@
  fi
  
  if [ ".$PERL" = . ] ; then
-@@ -945,9 +960,9 @@
+@@ -945,9 +963,9 @@
  # compiler for the platform ... in which case we add it on
  # the end ... otherwise we leave it off
  
@@ -332,7 +334,7 @@
  fi
  
  OUT="$PREFIX$OUT"
-@@ -957,9 +972,9 @@
+@@ -957,9 +975,9 @@
    echo Configuring for $OUT
  
    if [ "$TEST" = "true" ]; then