strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kfreebsdport01: fix openssl build on GNU/kFreeBSD

Browse source
This commit is contained in:
Rene Engelhard 2010-04-17 14:38:13 +02:00
parent b61b265e18
commit ee0b041740
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
openssl/makefile.mk
View file

@ -61,15 +61,25 @@ OUT2LIB = libssl.*
OUT2LIB += libcrypto.* OUT2LIB += libcrypto.*
OUT2INC += include/openssl/* OUT2INC += include/openssl/*
UNAME=$(shell uname)
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \ ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8l.map \ libcrypto_OOo_0_9_8l.map \
libssl_OOo_0_9_8l.map libssl_OOo_0_9_8l.map
.IF "$(CPU)" == "I" .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" .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 .ELSE
CONFIGURE_ACTION=Configure linux-generic32 CONFIGURE_ACTION=Configure linux-generic32
.ENDIF .ENDIF

12
openssl/openssllnx.patch
View file

@ -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/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 +++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
@@ -408,7 +408,7 @@ @@ -408,7 +408,7 @@