diff --git a/disabled-packages/openssl/Configurations-15-android.conf.patch b/disabled-packages/openssl/Configurations-15-android.conf.patch index 750fa00c7..1e8c029b0 100644 --- a/disabled-packages/openssl/Configurations-15-android.conf.patch +++ b/disabled-packages/openssl/Configurations-15-android.conf.patch @@ -1,7 +1,7 @@ -diff -u -r ../openssl-1.1.1-pre8/Configurations/15-android.conf ./Configurations/15-android.conf ---- ../openssl-1.1.1-pre8/Configurations/15-android.conf 2018-06-20 14:48:09.000000000 +0000 -+++ ./Configurations/15-android.conf 2018-08-17 21:34:02.996980008 +0000 -@@ -127,10 +127,10 @@ +diff -u -r ../openssl-1.1.1-pre9/Configurations/15-android.conf ./Configurations/15-android.conf +--- ../openssl-1.1.1-pre9/Configurations/15-android.conf 2018-08-21 12:14:11.000000000 +0000 ++++ ./Configurations/15-android.conf 2018-08-22 09:48:30.506584421 +0000 +@@ -130,10 +130,10 @@ # systems are perfectly capable of executing binaries targeting # Froyo. Keep in mind that in the nutshell Android builds are # about JNI, i.e. shared libraries, not applications. @@ -16,3 +16,32 @@ diff -u -r ../openssl-1.1.1-pre8/Configurations/15-android.conf ./Configurations bin_cflags => "-pie", enable => [ ], }, +@@ -166,11 +166,11 @@ + # Newer NDK versions reportedly require additional -latomic. + # + inherit_from => [ "android", asm("armv4_asm") ], +- bn_ops => add("RC4_CHAR"), ++ bn_ops => add("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"), + perlasm_scheme => "linux64", + }, + +@@ -197,12 +197,12 @@ + "android-x86" => { + 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"), + 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"), + perlasm_scheme => "elf", + }, + diff --git a/disabled-packages/openssl/build.sh b/disabled-packages/openssl/build.sh index 92fa6ab48..e7aa4ff35 100755 --- a/disabled-packages/openssl/build.sh +++ b/disabled-packages/openssl/build.sh @@ -15,7 +15,7 @@ termux_step_configure () { perl -p -i -e "s@TERMUX_CFLAGS@$CFLAGS@g" Configure rm -Rf $TERMUX_PREFIX/lib/libcrypto.* $TERMUX_PREFIX/lib/libssl.* - test $TERMUX_ARCH = "arm" && TERMUX_OPENSSL_PLATFORM="android-armeabi" + test $TERMUX_ARCH = "arm" && TERMUX_OPENSSL_PLATFORM="android-arm" test $TERMUX_ARCH = "aarch64" && TERMUX_OPENSSL_PLATFORM="android-arm64" test $TERMUX_ARCH = "i686" && TERMUX_OPENSSL_PLATFORM="android-x86" test $TERMUX_ARCH = "x86_64" && TERMUX_OPENSSL_PLATFORM="android-x86_64" @@ -33,7 +33,7 @@ termux_step_configure () { termux_step_make () { make depend - make -j 1 all + make -j $TERMUX_MAKE_PROCESSES all } termux_step_make_install () {