From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 20 Nov 2004 21:16:02 +0000 (+0000)
Subject: - hack to fix build on i386
X-Git-Tag: auto/ac/openssl-0_9_7e-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=04a327715c9dbfeb6e113df7e73df4a9acd60410

- hack to fix build on i386
- use default x86 code on i486 (only i386 is exceptional)

Changed files:
    openssl.spec -> 1.133
---

diff --git a/openssl.spec b/openssl.spec
index 36b3b2b..0c8e811 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -181,6 +181,10 @@ RC4, RSA 
 %patch2 -p1
 %patch3 -p1
 
+# conflicts with i386-only DES implementation
+# (missing #ifdef OPENSSL_FIPS  ...  #endif)
+:> fips/des/asm/fips-dx86-elf.s
+
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
 	`grep -l -r "%{_prefix}/local/bin/perl" *`
@@ -192,7 +196,8 @@ touch Makefile.*
 OPTFLAGS="%{rpmcflags}"
 export OPTFLAGS
 %ifarch %{ix86}
-%ifarch i386 i486
+%ifarch i386
+# allow running on 80386 (default code uses bswapl available on i486+)
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
 %else
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared