[packages/openssl102: 176/432] - hack to fix build on i386 - use default x86 code on i486 (only i386 is exceptional)

adwol adwol at pld-linux.org
Sat Sep 29 01:16:23 CEST 2018


commit 04a327715c9dbfeb6e113df7e73df4a9acd60410
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 20 21:16:02 2004 +0000

    - hack to fix build on i386
    - use default x86 code on i486 (only i386 is exceptional)
    
    Changed files:
        openssl.spec -> 1.133

 openssl.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/openssl.spec b/openssl.spec
index 36b3b2b..0c8e811 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -181,6 +181,10 @@ ¦
 %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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl102.git/commitdiff/9fc1b1b87b259e8a327c99835865e91a391efc9e



More information about the pld-cvs-commit mailing list