forked from pool/openssl
75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
|
Index: openssl-1.0.0/Configure
|
||
|
|
===================================================================
|
||
|
|
--- openssl-1.0.0.orig/Configure
|
||
|
|
+++ openssl-1.0.0/Configure
|
||
|
|
@@ -866,7 +866,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=$_;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1105,7 +1105,7 @@ else { $lflags=$prelflags; undef $pre
|
||
|
|
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
|
||
|
|
Index: openssl-1.0.0/config
|
||
|
|
===================================================================
|
||
|
|
--- openssl-1.0.0.orig/config
|
||
|
|
+++ openssl-1.0.0/config
|
||
|
|
@@ -560,7 +560,8 @@ case "$GUESSOS" in
|
||
|
|
fi
|
||
|
|
OUT="darwin-i386-cc" ;;
|
||
|
|
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" ;;
|
||
|
|
@@ -580,7 +581,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" ;;
|
||
|
|
ia64-*-linux?) OUT="linux-ia64" ;;
|
||
|
|
@@ -596,10 +598,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
|
||
|
|
@@ -618,7 +620,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"
|