diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-02-24 21:09:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-02-24 21:09:03 +0000 |
| commit | 9a97bfcc2bfe32819ce22d1f73360020e854efe6 (patch) | |
| tree | 37d429007152dc6163befa7f2746b1e209e8d009 /package/libs/openssl | |
| parent | b2ef0616ba79dea9da193aa88bb758a51f3c10ca (diff) | |
| download | mtk-20170518-9a97bfcc2bfe32819ce22d1f73360020e854efe6.zip mtk-20170518-9a97bfcc2bfe32819ce22d1f73360020e854efe6.tar.gz mtk-20170518-9a97bfcc2bfe32819ce22d1f73360020e854efe6.tar.bz2 | |
openssl: use termios instead of termio
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39748
Diffstat (limited to 'package/libs/openssl')
| -rw-r--r-- | package/libs/openssl/patches/110-optimize-for-size.patch | 4 | ||||
| -rw-r--r-- | package/libs/openssl/patches/210-termios_fix.patch | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/package/libs/openssl/patches/110-optimize-for-size.patch b/package/libs/openssl/patches/110-optimize-for-size.patch index 85dba1e..9869c97 100644 --- a/package/libs/openssl/patches/110-optimize-for-size.patch +++ b/package/libs/openssl/patches/110-optimize-for-size.patch @@ -5,8 +5,8 @@ "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}", +# OpenWrt targets -+"linux-mips-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-generic-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -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)", ++"linux-mips-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-generic-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -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)", + # 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/libs/openssl/patches/210-termios_fix.patch b/package/libs/openssl/patches/210-termios_fix.patch new file mode 100644 index 0000000..f14960c --- /dev/null +++ b/package/libs/openssl/patches/210-termios_fix.patch @@ -0,0 +1,11 @@ +--- a/crypto/ui/ui_openssl.c ++++ b/crypto/ui/ui_openssl.c +@@ -190,7 +190,7 @@ + # undef SGTTY + #endif + +-#if defined(linux) && !defined(TERMIO) ++#if defined(linux) && !defined(TERMIO) && !defined(TERMIOS) + # undef TERMIOS + # define TERMIO + # undef SGTTY |