diff options
Diffstat (limited to 'packaging/merge_from_0.9.8k.patch')
| -rw-r--r-- | packaging/merge_from_0.9.8k.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/packaging/merge_from_0.9.8k.patch b/packaging/merge_from_0.9.8k.patch new file mode 100644 index 0000000..55d9f04 --- /dev/null +++ b/packaging/merge_from_0.9.8k.patch @@ -0,0 +1,70 @@ +--- openssl-1.0.1c.orig/Configure ++++ openssl-1.0.1c/Configure +@@ -931,7 +931,7 @@ PROCESS_ARGS: + } + else + { +- die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); ++ warn "target already defined - $target (offending arg: $_)\n" if ($target ne ""); + $target=$_; + } + +@@ -1204,7 +1204,7 @@ if ($target =~ /^mingw/ && `$cc --target + my $no_shared_warn=0; + my $no_user_cflags=0; + +-if ($flags ne "") { $cflags="$flags$cflags"; } ++if ($flags ne "") { $cflags="$cflags $flags"; } + else { $no_user_cflags=1; } + + # Kerberos settings. The flavor must be provided from outside, either through +--- openssl-1.0.1c.orig/config ++++ openssl-1.0.1c/config +@@ -573,7 +573,8 @@ case "$GUESSOS" in + options="$options -arch%20${MACHINE}" + OUT="iphoneos-cross" ;; + alpha-*-linux2) +- ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` ++ #ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` ++ ISA=EV56 + case ${ISA:-generic} in + *[678]) OUT="linux-alpha+bwx-$CC" ;; + *) OUT="linux-alpha-$CC" ;; +@@ -593,7 +594,8 @@ case "$GUESSOS" in + 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 + fi +- OUT="linux-ppc" ++ # we have the target and force it here ++ OUT="linux-ppc64" + ;; + ppc-*-linux2) OUT="linux-ppc" ;; + ppc60x-*-vxworks*) OUT="vxworks-ppc60x" ;; +@@ -614,10 +616,10 @@ case "$GUESSOS" in + sparc-*-linux2) + KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo` + case ${KARCH:-sun4} in +- sun4u*) OUT="linux-sparcv9" ;; +- sun4m) OUT="linux-sparcv8" ;; +- sun4d) OUT="linux-sparcv8" ;; +- *) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; ++# sun4u*) OUT="linux-sparcv9" ;; ++# sun4m) OUT="linux-sparcv8" ;; ++# sun4d) OUT="linux-sparcv8" ;; ++ *) OUT="linux-sparcv8" ;; + esac ;; + parisc*-*-linux2) + # 64-bit builds under parisc64 linux are not supported and +@@ -636,7 +638,11 @@ case "$GUESSOS" in + # PA8500 -> 8000 (2.0) + # PA8600 -> 8000 (2.0) + +- CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'` ++ # CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'` ++ # lets have CPUSCHEDULE for 1.1: ++ CPUSCHEDULE=7100LC ++ # we want to support 1.1 CPUs as well: ++ CPUARCH=1.1 + # Finish Model transformations + + options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH" |