summaryrefslogtreecommitdiff
path: root/openssl/openssllnx.patch
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-06-16 16:20:29 +0200
committerJoachim Lingner <jl@openoffice.org>2010-06-16 16:20:29 +0200
commit210b5923e9fc9114996037aa628829e5fabc5602 (patch)
tree52275251959e23e62f1baf5a37e8d5cc9e61bf9b /openssl/openssllnx.patch
parent3b5bd23c4eceeffc4ddd04ff6209697a7a9f01a3 (diff)
parent8027e13d54cb3a3ee748f140ceb59492af2825e9 (diff)
jl153 merge with DEV300_m82
Diffstat (limited to 'openssl/openssllnx.patch')
-rw-r--r--openssl/openssllnx.patch16
1 files changed, 14 insertions, 2 deletions
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index bb3d72c706fd..abd10061ff5c 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,5 +1,17 @@
---- misc/openssl-0.9.8o/config 2010-03-09 18:08:24.000000000 +0100
-+++ misc/build/openssl-0.9.8o/config 2010-03-26 15:21:12.049659235 +0100
+--- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000 +0200
++++ misc/build/openssl-0.9.8o/Configure 2010-04-17 13:52:03.000000000 +0200
+@@ -388,6 +388,9 @@
+
+ "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
++"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+
+--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------