summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-06-09 08:34:10 +0200
committerobo <obo@openoffice.org>2010-06-09 08:34:10 +0200
commit9f1127bc427825be30e43067a88037b376bfbe5e (patch)
treef8b6e77c1b48767d1d4ac348479f405503130b9d /openssl
parentf9e1672933827e4f38817ca4d7bbbe062b5f5735 (diff)
parent60137211233861884b4d035b9bdd5e3c06682fba (diff)
CWS-TOOLING: integrate CWS kfreebsdport01v2
Diffstat (limited to 'openssl')
-rw-r--r--openssl/makefile.mk14
-rw-r--r--openssl/openssllnx.patch12
2 files changed, 24 insertions, 2 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index bfbff09d80fa..081680781a2c 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -62,15 +62,25 @@ OUT2LIB = libssl.*
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
+UNAME=$(shell uname)
+
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8l.map \
libssl_OOo_0_9_8l.map
.IF "$(CPU)" == "I"
- CONFIGURE_ACTION=Configure linux-elf
+ .IF "$(UNAME)" == "GNU/kFreeBSD"
+ CONFIGURE_ACTION=Configure debian-kfreebsd-i386
+ .ELSE
+ CONFIGURE_ACTION=Configure linux-elf
+ .ENDIF
.ELIF "$(BUILD64)" == "1"
- CONFIGURE_ACTION=Configure linux-generic64
+ .IF "$(UNAME)" == "GNU/kFreeBSD"
+ CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
+ .ELSE
+ CONFIGURE_ACTION=Configure linux-generic64
+ .ENDIF
.ELSE
CONFIGURE_ACTION=Configure linux-generic32
.ENDIF
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 2eb929474ae1..7f26b997bd1c 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,3 +1,15 @@
+--- misc/build/openssl-0.9.8l/Configure-old 2010-04-17 13:51:42.000000000 +0200
++++ misc/build/openssl-0.9.8l/Configure 2010-04-17 13:52:03.000000000 +0200
+@@ -382,6 +382,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.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
@@ -408,7 +408,7 @@