1.1 --- a/openpkg/openssl.patch Wed Aug 01 23:24:50 2012 +0200
1.2 +++ b/openpkg/openssl.patch Wed Aug 01 23:26:35 2012 +0200
1.3 @@ -84,22 +84,25 @@
1.4 if [ "$GCCVER" != "" ]; then
1.5 # then strip off whatever prefix egcs prepends the number with...
1.6 # Hopefully, this will work for any future prefixes as well.
1.7 -@@ -424,8 +427,14 @@
1.8 +@@ -424,8 +427,17 @@
1.9 # peak single digit before and after first dot, e.g. 2.95.1 gives 29
1.10 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
1.11 CC=gcc
1.12 + SUFFIX=gcc
1.13 - else
1.14 - CC=cc
1.15 ++ else
1.16 ++ CC=cc
1.17 + SUFFIX=cc
1.18 + fi
1.19 +else
1.20 + if [ "$GCCVER" != "" ]; then
1.21 + SUFFIX=gcc
1.22 + else
1.23 + CC=cc
1.24 ++ SUFFIX=cc
1.25 fi
1.26 fi
1.27 GCCVER=${GCCVER:-0}
1.28 -@@ -435,7 +444,7 @@
1.29 +@@ -435,7 +447,7 @@
1.30 if [ $GCCVER -ge 30 ]; then
1.31 # PA64 support only came in with gcc 3.0.x.
1.32 # We check if the preprocessor symbol __LP64__ is defined...
1.33 @@ -108,7 +111,7 @@
1.34 : # __LP64__ has slipped through, it therefore is not defined
1.35 else
1.36 GCC_BITS="64"
1.37 -@@ -446,13 +455,14 @@
1.38 +@@ -446,13 +458,14 @@
1.39 if [ $GCCVER -ge 30 ]; then
1.40 # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
1.41 # to be working, at the very least 'make test' passes...
1.42 @@ -124,7 +127,7 @@
1.43 CCVER=`(cc -V 2>&1) 2>/dev/null | \
1.44 egrep -e '^cc: .* C [0-9]\.[0-9]' | \
1.45 sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
1.46 -@@ -465,6 +475,7 @@
1.47 +@@ -465,6 +478,7 @@
1.48 sleep 5
1.49 fi
1.50 fi
1.51 @@ -132,7 +135,7 @@
1.52 fi
1.53
1.54 if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
1.55 -@@ -482,6 +493,7 @@
1.56 +@@ -482,6 +496,7 @@
1.57
1.58 if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
1.59 (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
1.60 @@ -140,7 +143,7 @@
1.61 fi
1.62
1.63 CCVER=${CCVER:-0}
1.64 -@@ -507,7 +519,7 @@
1.65 +@@ -507,7 +522,7 @@
1.66 if [ $CPU -ge 4000 ]; then
1.67 options="$options -mips2"
1.68 fi
1.69 @@ -149,7 +152,7 @@
1.70 ;;
1.71 mips3-sgi-irix)
1.72 #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
1.73 -@@ -517,11 +529,11 @@
1.74 +@@ -517,11 +532,11 @@
1.75 #else
1.76 # options="$options -mips3"
1.77 #fi
1.78 @@ -163,7 +166,7 @@
1.79 if [ "$TEST" = "false" -a -t 1 ]; then
1.80 echo " You have about 5 seconds to press Ctrl-C to abort."
1.81 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
1.82 -@@ -533,7 +545,7 @@
1.83 +@@ -533,7 +548,7 @@
1.84 #else
1.85 # options="$options -mips3"
1.86 #fi
1.87 @@ -172,7 +175,7 @@
1.88 ;;
1.89 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
1.90 ppc-apple-darwin*)
1.91 -@@ -566,6 +578,9 @@
1.92 +@@ -566,6 +581,9 @@
1.93 else
1.94 OUT="darwin-i386-cc"
1.95 fi ;;
1.96 @@ -182,7 +185,7 @@
1.97 armv6+7-*-iphoneos)
1.98 options="$options -arch%20armv6 -arch%20armv7"
1.99 OUT="iphoneos-cross" ;;
1.100 -@@ -575,10 +590,10 @@
1.101 +@@ -575,10 +593,10 @@
1.102 alpha-*-linux2)
1.103 ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
1.104 case ${ISA:-generic} in
1.105 @@ -196,7 +199,7 @@
1.106 case ${ISA:-generic} in
1.107 EV5|EV45) options="$options -mcpu=ev5";;
1.108 EV56|PCA56) options="$options -mcpu=ev56";;
1.109 -@@ -662,7 +677,7 @@
1.110 +@@ -662,7 +680,7 @@
1.111 ;;
1.112 x86_64-*-linux?) OUT="linux-x86_64" ;;
1.113 *86-*-linux2) OUT="linux-elf"
1.114 @@ -205,7 +208,7 @@
1.115 if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
1.116 options="$options -march=pentium"
1.117 fi
1.118 -@@ -676,17 +691,17 @@
1.119 +@@ -676,17 +694,17 @@
1.120 *-*-linux1) OUT="linux-aout" ;;
1.121 *-*-linux2) OUT="linux-generic32" ;;
1.122 sun4[uv]*-*-solaris2)
1.123 @@ -226,7 +229,7 @@
1.124 # $GCC_ARCH denotes default ABI chosen by compiler driver
1.125 # (first one found on the $PATH). I assume that user
1.126 # expects certain consistency with the rest of his builds
1.127 -@@ -712,21 +727,21 @@
1.128 +@@ -712,21 +730,21 @@
1.129 OUT="solaris64-sparcv9-$CC"
1.130 fi
1.131 ;;
1.132 @@ -238,9 +241,8 @@
1.133 + sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;;
1.134 *86*-*-solaris2)
1.135 ISA64=`(isalist) 2>/dev/null | grep amd64`
1.136 -- if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
1.137 + if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
1.138 - OUT="solaris64-x86_64-$CC"
1.139 -+ if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
1.140 + OUT="solaris64-x86_64-$SUFFIX"
1.141 else
1.142 - OUT="solaris-x86-$CC"
1.143 @@ -255,7 +257,7 @@
1.144
1.145 *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
1.146 alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
1.147 -@@ -750,7 +765,7 @@
1.148 +@@ -750,7 +768,7 @@
1.149 *-*-osf) OUT="osf1-alpha-cc" ;;
1.150 *-*-tru64) OUT="tru64-alpha-cc" ;;
1.151 *-*-[Uu]nix[Ww]are7)
1.152 @@ -264,7 +266,7 @@
1.153 OUT="unixware-7-gcc" ; options="$options no-sse2"
1.154 else
1.155 OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
1.156 -@@ -761,12 +776,12 @@
1.157 +@@ -761,12 +779,12 @@
1.158 *-*-vos)
1.159 options="$options no-threads no-shared no-asm no-dso"
1.160 EXE=".pm"
1.161 @@ -279,7 +281,7 @@
1.162 OUT="hpux64-parisc2-gcc"
1.163 fi
1.164 [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
1.165 -@@ -781,8 +796,8 @@
1.166 +@@ -781,8 +799,8 @@
1.167 OUT="hpux-ia64-cc"
1.168 fi
1.169 elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU
1.170 @@ -290,7 +292,7 @@
1.171 echo "WARNING! If you wish to build 64-bit library then you have to"
1.172 echo " invoke './Configure hpux64-parisc2-cc' *manually*."
1.173 if [ "$TEST" = "false" -a -t 1 ]; then
1.174 -@@ -791,9 +806,9 @@
1.175 +@@ -791,9 +809,9 @@
1.176 fi
1.177 fi
1.178 elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
1.179 @@ -302,7 +304,7 @@
1.180 else # Motorola(?) CPU
1.181 OUT="hpux-$CC"
1.182 fi
1.183 -@@ -803,7 +818,7 @@
1.184 +@@ -803,7 +821,7 @@
1.185 [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
1.186 KERNEL_BITS=${KERNEL_BITS:-32}
1.187 OBJECT_MODE=${OBJECT_MODE:-32}
1.188 @@ -311,7 +313,7 @@
1.189 OUT="aix-gcc"
1.190 if [ $OBJECT_MODE -eq 64 ]; then
1.191 echo 'Your $OBJECT_MODE was found to be set to 64'
1.192 -@@ -913,7 +928,7 @@
1.193 +@@ -913,7 +931,7 @@
1.194 #fi
1.195
1.196 if [ -z "$OUT" ]; then
1.197 @@ -320,7 +322,7 @@
1.198 fi
1.199
1.200 if [ ".$PERL" = . ] ; then
1.201 -@@ -945,9 +960,9 @@
1.202 +@@ -945,9 +963,9 @@
1.203 # compiler for the platform ... in which case we add it on
1.204 # the end ... otherwise we leave it off
1.205
1.206 @@ -332,7 +334,7 @@
1.207 fi
1.208
1.209 OUT="$PREFIX$OUT"
1.210 -@@ -957,9 +972,9 @@
1.211 +@@ -957,9 +975,9 @@
1.212 echo Configuring for $OUT
1.213
1.214 if [ "$TEST" = "true" ]; then
