openssl: Fix broken Configuration patch

This commit is contained in:
Fredrik Fornwall 2018-09-14 22:16:09 +02:00
parent 2e60651376
commit a38fac51ce
2 changed files with 5 additions and 4 deletions

View File

@ -21,12 +21,12 @@ diff -u -r ../openssl-1.1.1-pre9/Configurations/15-android.conf ./Configurations
#
inherit_from => [ "android", asm("armv4_asm") ],
- bn_ops => add("RC4_CHAR"),
+ bn_ops => add("BN_LLONG RC4_CHAR"),
+ bn_ops => "BN_LLONG RC4_CHAR",
},
"android-arm64" => {
inherit_from => [ "android", asm("aarch64_asm") ],
- bn_ops => add("RC4_CHAR"),
+ bn_ops => add("SIXTY_FOUR_BIT_LONG RC4_CHAR"),
+ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "linux64",
},
@ -35,13 +35,13 @@ diff -u -r ../openssl-1.1.1-pre9/Configurations/15-android.conf ./Configurations
inherit_from => [ "android", asm("x86_asm") ],
CFLAGS => add(picker(release => "-fomit-frame-pointer")),
- bn_ops => add("RC4_INT"),
+ bn_ops => add("BN_LLONG RC4_INT"),
+ bn_ops => "BN_LLONG RC4_INT",
perlasm_scheme => "android",
},
"android-x86_64" => {
inherit_from => [ "android", asm("x86_64_asm") ],
- bn_ops => add("RC4_INT"),
+ bn_ops => add("SIXTY_FOUR_BIT_LONG RC4_INT"),
+ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_INT",
perlasm_scheme => "elf",
},

View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.openssl.org/
TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions"
TERMUX_PKG_DEPENDS="ca-certificates"
TERMUX_PKG_VERSION=1.1.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d
TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz
TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"