Fix wrong python2 configure argument for openssl

kivy · Nov 21, 2018 · 169a4da · 169a4da
1 parent b8b8aba
commit 169a4da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pythonforandroid/python.py b/pythonforandroid/python.py
@@ -194,8 +194,6 @@ def add_flags(include_flags, link_flags):
             info('Activating flags for openssl')
             recipe = Recipe.get_recipe('openssl', self.ctx)
             add_flags(recipe.include_flags(arch), recipe.link_flags(arch))
-            self.configure_args += \
-                ('--with-openssl=' + recipe.get_build_dir(arch.arch),)
         return env
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):

diff --git a/pythonforandroid/recipes/python3/__init__.py b/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()