Enable openssl support for python recipes

This commit grants openssl support for both python versions (2 and 3). The python2 recipe needs some extra work to make it link with python, we need to patch the setup.py file in order to that the python's build system recognises the libraries. This is not the case for the python3 recipe which works like a charm, except for the fact that we have to modify our static class variable ` config_args ` for the python's recipe, i found this to be necessary in my tests, otherwise the openssl libs aren't detected.

Author: opacam

pythonforandroid/python.py

@@ -162,7 +162,7 @@ class GuestPythonRecipe(TargetPythonRecipe):
     '''The file extensions from site packages dir that we don't want to be
     included in our python bundle.'''
 
-    opt_depends = ['sqlite3', 'libffi']
+    opt_depends = ['sqlite3', 'libffi', 'openssl']
     '''The optional libraries which we would like to get our python linked'''
 
     def __init__(self, *args, **kwargs):
@@ -190,6 +190,10 @@ def add_flags(include_flags, link_flags):
                       ' -L' + join(recipe.get_build_dir(arch.arch),
                                    recipe.get_host(arch), '.libs') + ' -lffi')
 
+        if 'openssl' in self.ctx.recipe_build_order:
+            info('Activating flags for openssl')
+            recipe = Recipe.get_recipe('openssl', self.ctx)
+            add_flags(recipe.include_flags(arch), recipe.link_flags(arch))
         return env
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
@@ -230,12 +234,12 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
 
         ndk_flags = (
             '--sysroot={ndk_sysroot} -D__ANDROID_API__={android_api} '
-            '-isystem {ndk_android_host}').format(
+            '-isystem {ndk_android_host} -I{ndk_include}').format(
                 ndk_sysroot=join(self.ctx.ndk_dir, 'sysroot'),
                 android_api=self.ctx.ndk_api,
                 ndk_android_host=join(
-                    self.ctx.ndk_dir, 'sysroot', 'usr', 'include',
-                    android_host))
+                    self.ctx.ndk_dir, 'sysroot', 'usr', 'include', android_host),
+                ndk_include=join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include'))
         sysroot = join(self.ctx.ndk_dir, 'platforms',
                        platform_name, 'arch-arm')
         env['CFLAGS'] = env.get('CFLAGS', '') + ' ' + ndk_flags

pythonforandroid/recipes/python2/__init__.py

@@ -1,4 +1,8 @@
+from os.path import join, exists
+from pythonforandroid.recipe import Recipe
 from pythonforandroid.python import GuestPythonRecipe
+from pythonforandroid.logger import shprint
+import sh
 
 
 class Python2Recipe(GuestPythonRecipe):
@@ -43,5 +47,21 @@ class Python2Recipe(GuestPythonRecipe):
                       '--prefix={prefix}',
                       '--exec-prefix={exec_prefix}')
 
+    def prebuild_arch(self, arch):
+        super(Python2Recipe, self).prebuild_arch(arch)
+        patch_mark = join(self.get_build_dir(arch.arch), '.openssl-patched')
+        if 'openssl' in self.ctx.recipe_build_order and not exists(patch_mark):
+            self.apply_patch(join('patches', 'enable-openssl.patch'), arch.arch)
+            shprint(sh.touch, patch_mark)
+
+    def set_libs_flags(self, env, arch):
+        env = super(Python2Recipe, self).set_libs_flags(env, arch)
+        if 'openssl' in self.ctx.recipe_build_order:
+            recipe = Recipe.get_recipe('openssl', self.ctx)
+            openssl_build = recipe.get_build_dir(arch.arch)
+            env['OPENSSL_BUILD'] = openssl_build
+            env['OPENSSL_VERSION'] = recipe.version
+        return env
+
 
 recipe = Python2Recipe()

pythonforandroid/recipes/python2/patches/enable-openssl.patch

@@ -0,0 +1,46 @@
+--- Python-2.7.15.orig/setup.py	2018-04-30 00:47:33.000000000 +0200
++++ Python-2.7.15/setup.py	2018-07-05 11:08:57.305125432 +0200
+@@ -812,18 +840,15 @@ class PyBuildExt(build_ext):
+                               '/usr/local/ssl/include',
+                               '/usr/contrib/ssl/include/'
+                              ]
+-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
+-                             search_for_ssl_incs_in
+-                             )
++        ssl_incs = [
++            os.path.join(os.environ["OPENSSL_BUILD"], 'include'),
++            os.path.join(os.environ["OPENSSL_BUILD"], 'include', 'openssl')]
+         if ssl_incs is not None:
+             krb5_h = find_file('krb5.h', inc_dirs,
+                                ['/usr/kerberos/include'])
+             if krb5_h:
+                 ssl_incs += krb5_h
+-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
+-                                      '/usr/contrib/ssl/lib/'
+-                                     ] )
++        ssl_libs = [os.environ["OPENSSL_BUILD"]]
+
+         if (ssl_incs is not None and
+             ssl_libs is not None):
+@@ -841,8 +866,8 @@ class PyBuildExt(build_ext):
+             '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
+
+         # look for the openssl version header on the compiler search path.
+-        opensslv_h = find_file('openssl/opensslv.h', [],
+-                inc_dirs + search_for_ssl_incs_in)
++        opensslv_h = [os.path.join(os.environ["OPENSSL_BUILD"], 'include'),
++                      os.path.join(os.environ["OPENSSL_BUILD"], 'include', 'openssl')]
+         if opensslv_h:
+             name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
+             if host_platform == 'darwin' and is_macosx_sdk_path(name):
+@@ -859,8 +884,7 @@ class PyBuildExt(build_ext):
+
+         min_openssl_ver = 0x00907000
+         have_any_openssl = ssl_incs is not None and ssl_libs is not None
+-        have_usable_openssl = (have_any_openssl and
+-                               openssl_ver >= min_openssl_ver)
++        have_usable_openssl = (have_any_openssl and True)
+
+         if have_any_openssl:
+             if have_usable_openssl:

pythonforandroid/recipes/python3/__init__.py

@@ -1,4 +1,5 @@
 from pythonforandroid.python import GuestPythonRecipe
+from pythonforandroid.recipe import Recipe
 
 
 class Python3Recipe(GuestPythonRecipe):
@@ -38,5 +39,13 @@ class Python3Recipe(GuestPythonRecipe):
         '--prefix={prefix}',
         '--exec-prefix={exec_prefix}')
 
+    def set_libs_flags(self, env, arch):
+        env = super(Python3Recipe, self).set_libs_flags(env, arch)
+        if 'openssl' in self.ctx.recipe_build_order:
+            recipe = Recipe.get_recipe('openssl', self.ctx)
+            self.configure_args += \
+                ('--with-openssl=' + recipe.get_build_dir(arch.arch),)
+        return env
+
 
 recipe = Python3Recipe()