Merge pull request kivy#2000 from kivy/fix-libcurl

tito · web-flow · commit 39384452a2b6 · 2019-11-19T21:59:44.000+01:00
Fix libcurl with openssl
diff --git a/pythonforandroid/recipes/libcurl/__init__.py b/pythonforandroid/recipes/libcurl/__init__.py
@@ -15,8 +15,11 @@ class LibcurlRecipe(Recipe):
     def build_arch(self, arch):
         env = self.get_recipe_env(arch)
 
-        r = self.get_recipe('openssl', self.ctx)
-        openssl_dir = r.get_build_dir(arch.arch)
+        openssl_recipe = self.get_recipe('openssl', self.ctx)
+        openssl_dir = openssl_recipe.get_build_dir(arch.arch)
+
+        env['LDFLAGS'] += openssl_recipe.link_dirs_flags(arch)
+        env['LIBS'] = env.get('LIBS', '') + openssl_recipe.link_libs_flags()
 
         with current_directory(self.get_build_dir(arch.arch)):
             dst_dir = join(self.get_build_dir(arch.arch), 'dist')
