diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-01-31 14:37:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-01-31 14:37:35 +0100 |
| commit | 747d98ea03f7ba4181f0b9185d3d73d1734bb8d1 (patch) | |
| tree | 14fb4708498c727d6690be47abbfba568bcd4f03 /package/openssl/patches | |
| parent | bb2385e3efd35d3d0f95677a1833fbfc6a314af8 (diff) | |
fix build on x86_64
Diffstat (limited to 'package/openssl/patches')
| -rw-r--r-- | package/openssl/patches/patch-Configure | 11 | ||||
| -rw-r--r-- | package/openssl/patches/patch-Makefile_org | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure index 9275cd530..d5ec7cc28 100644 --- a/package/openssl/patches/patch-Configure +++ b/package/openssl/patches/patch-Configure @@ -1,10 +1,11 @@ ---- openssl-1.0.0.orig/Configure 2010-01-19 22:40:54.000000000 +0100 -+++ openssl-1.0.0/Configure 2010-05-29 15:58:43.561613735 +0200 -@@ -379,6 +379,7 @@ my %table=( +--- openssl-1.0.1c.orig/Configure 2012-03-14 23:20:40.000000000 +0100 ++++ openssl-1.0.1c/Configure 2013-01-31 14:32:14.000000000 +0100 +@@ -400,6 +400,8 @@ my %table=( "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", +"linux-embedded","gcc:-DTERMIO \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### *BSD [do see comment about ${BSDthreads} above!] - "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # Android: linux-* but without -DTERMIO and pointers to headers and libs. + "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org index f72030d14..f19124dbe 100644 --- a/package/openssl/patches/patch-Makefile_org +++ b/package/openssl/patches/patch-Makefile_org @@ -1,8 +1,8 @@ ---- openssl-1.0.0d.orig/Makefile.org 2010-01-27 17:06:58.000000000 +0100 -+++ openssl-1.0.0d/Makefile.org 2011-10-12 06:07:40.993200000 +0200 -@@ -109,7 +109,7 @@ LIBKRB5= - ZLIB_INCLUDE= - LIBZLIB= +--- openssl-1.0.1c.orig/Makefile.org 2012-04-22 15:25:19.000000000 +0200 ++++ openssl-1.0.1c/Makefile.org 2013-01-31 14:28:34.000000000 +0100 +@@ -135,7 +135,7 @@ FIPSCANLIB= + + BASEADDR= -DIRS= crypto ssl engines apps test tools +DIRS= crypto ssl engines apps tools |