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