Merge branch 'master' of https://github.com/kivy/python-for-android into fix-python2-gethost

opacam · opacam · commit efa8b997a942 · 2019-01-11T22:13:37.000+01:00
diff --git a/pythonforandroid/python.py b/pythonforandroid/python.py
@@ -231,7 +231,12 @@ def build_arch(self, arch):
                     _env=env)
 
             if not exists('python'):
-                shprint(sh.make, 'all', _env=env)
+                py_version = self.major_minor_version_string
+                if self.major_minor_version_string[0] == '3':
+                    py_version += 'm'
+                shprint(sh.make, 'all',
+                        'INSTSONAME=libpython{version}.so'.format(
+                            version=py_version), _env=env)
 
             # TODO: Look into passing the path to pyconfig.h in a
             # better way, although this is probably acceptable
@@ -291,9 +296,8 @@ def create_python_bundle(self, dirn, arch):
         python_lib_name = 'libpython' + self.major_minor_version_string
         if self.major_minor_version_string[0] == '3':
             python_lib_name += 'm'
-        for lib in [python_lib_name + '.so', python_lib_name + '.so.1.0']:
-            shprint(sh.cp, join(python_build_dir, lib),
-                    'libs/{}'.format(arch.arch))
+        shprint(sh.cp, join(python_build_dir, python_lib_name + '.so'),
+                'libs/{}'.format(arch.arch))
 
         info('Renaming .so files to reflect cross-compile')
         self.reduce_object_file_names(join(dirn, 'site-packages'))
diff --git a/pythonforandroid/recipes/Pillow/__init__.py b/pythonforandroid/recipes/Pillow/__init__.py
@@ -10,7 +10,6 @@ class PillowRecipe(CompiledComponentsPythonRecipe):
     url = 'https://github.com/python-pillow/Pillow/archive/{version}.tar.gz'
     site_packages_name = 'Pillow'
     depends = [
-        ('python2', 'python3crystax'),
         'png',
         'jpeg',
         'freetype',
diff --git a/pythonforandroid/recipes/lxml/__init__.py b/pythonforandroid/recipes/lxml/__init__.py
@@ -7,7 +7,7 @@
 class LXMLRecipe(CompiledComponentsPythonRecipe):
     version = "3.6.0"
     url = "https://pypi.python.org/packages/source/l/lxml/lxml-{version}.tar.gz"
-    depends = [("python2", "python3crystax"), "libxml2", "libxslt"]
+    depends = ["libxml2", "libxslt"]
     name = "lxml"
 
     call_hostpython_via_targetpython = False  # Due to setuptools
diff --git a/pythonforandroid/recipes/reportlab/__init__.py b/pythonforandroid/recipes/reportlab/__init__.py
@@ -8,7 +8,7 @@
 class ReportLabRecipe(CompiledComponentsPythonRecipe):
     version = 'c088826211ca'
     url = 'https://bitbucket.org/rptlab/reportlab/get/{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'freetype']
+    depends = ['freetype']
 
     def prebuild_arch(self, arch):
         if not self.is_patched(arch):
