patch openssl

Author: obfusk

pythonforandroid/recipes/openssl/__init__.py

@@ -131,6 +131,7 @@ def build_arch(self, arch):
                 buildarch,
                 '-D__ANDROID_API__={}'.format(self.ctx.ndk_api),
             ]
+            self.apply_patch('standalone-ndk.patch', arch.arch)
             shprint(perl, 'Configure', *config_args, _env=env)
             self.apply_patch('disable-sover.patch', arch.arch)
 

pythonforandroid/recipes/openssl/standalone-ndk.patch

@@ -0,0 +1,26 @@
+--- a/Configurations/15-android.conf	2021-01-02 03:49:06.227255874 +0100
++++ b/Configurations/15-android.conf	2021-01-02 04:06:22.239571311 +0100
+@@ -107,16 +107,20 @@
+                 }
+             } elsif (-f "$ndk/AndroidVersion.txt") {    #"standalone toolchain"
+                 my $cc = $user{CC} // "clang";
++                my $ndk_api = $ENV{NDK_API};
++                if ($ndk_api =~ m|^android-(\d+)$|) {
++                  $api = $1;
++                }
+                 # One can probably argue that both clang and gcc should be
+                 # probed, but support for "standalone toolchain" was added
+                 # *after* announcement that gcc is being phased out, so
+                 # favouring clang is considered adequate. Those who insist
+                 # have option to enforce test for gcc with CC=gcc.
+-                if (which("$triarch-$cc") !~ m|^$ndk|) {
++                if (which("$triarch$api-$cc") !~ m|^$ndk|) {
+                     die "no NDK $triarch-$cc on \$PATH";
+                 }
+-                $user{CC} = $cc;
+-                $user{CROSS_COMPILE} = "$triarch-";
++                $user{CC} = "$triarch$api-$cc";
++                $user{CROSS_COMPILE} = "";
+             } elsif ($user{CC} eq "clang") {
+                 die "no NDK clang on \$PATH";
+             } else {