Author: gb
Date: Mon Dec 11 11:30:36 2006
New Revision: 94730
Added:
packages/cooker/openssl/current/SOURCES/openssl-0.9.8b-ppc64.patch
Modified:
packages/cooker/openssl/current/SPECS/openssl.spec
Log:
merge from 2007.0-branch: fix build on ppc64
Added: packages/cooker/openssl/current/SOURCES/openssl-0.9.8b-ppc64.patch
==============================================================================
--- (empty file)
+++ packages/cooker/openssl/current/SOURCES/openssl-0.9.8b-ppc64.patch Mon Dec
11 11:30:36 2006
@@ -0,0 +1,12 @@
+--- openssl-0.9.8b/Configure.ppc64 2006-11-29 10:59:23.000000000 -0500
++++ openssl-0.9.8b/Configure 2006-11-29 11:02:14.000000000 -0500
+@@ -321,8 +321,7 @@ my %table=(
+ "linux-aout", "gcc:-DL_ENDIAN -DTERMIO \$(RPM_OPT_FLAGS)
-Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ ####
+ "linux-generic64","gcc:-DTERMIO \$(RPM_OPT_FLAGS)
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT
DES_UNROLL
BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-# -bpowerpc64-linux is transient option, -m64 should be the one to use...
+-"linux-ppc64", "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO
\$(RPM_OPT_FLAGS) -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR
RC4_CHUNK DES_RISC1
DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ppc64", "gcc:-m64 -DB_ENDIAN -DTERMIO \$(RPM_OPT_FLAGS)
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1
DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO \$(RPM_OPT_FLAGS)
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO \$(RPM_OPT_FLAGS) -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO \$(RPM_OPT_FLAGS) -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Modified: packages/cooker/openssl/current/SPECS/openssl.spec
==============================================================================
--- packages/cooker/openssl/current/SPECS/openssl.spec (original)
+++ packages/cooker/openssl/current/SPECS/openssl.spec Mon Dec 11 11:30:36 2006
@@ -30,6 +30,8 @@
Patch2: openssl-0.9.8a-optflags.diff
# (gb) 0.9.7b-4mdk: Make it lib64 aware. TODO: detect in Configure
Patch3: openssl-0.9.8b-lib64.diff
+# (gb) 0.9.8d-2mdv: fix build on ppc64
+Patch4: openssl-0.9.8b-ppc64.patch
# (oe) support Brazilian Government OTHERNAME X509v3 field (#14158)
# http://www.iti.gov.br/resolucoes/RESOLU__O_13_DE_26_04_2002.PDF
Patch6: openssl-0.9.8-beta6-icpbrasil.diff
@@ -133,6 +135,7 @@
%patch1 -p1 -b .ia64-asm
%patch2 -p0 -b .optflags
%patch3 -p1 -b .lib64
+%patch4 -p1 -b .ppc64
%patch6 -p0 -b .icpbrasil
%patch7 -p1 -b .defaults
%{?_with_krb5:%patch8 -p1 -b .krb5}
