Fix build of python's zlib module

Because we need that module to successfully run an android app and hopefully...will solve the `zip/unzip` issues reported in python-for-android's issues tracker

Author: opacam

pythonforandroid/python.py

@@ -92,7 +92,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', 'openssl']
+    opt_depends = ['sqlite3', 'libffi', 'openssl', 'zlib']
     '''The optional libraries which we would like to get our python linked'''
 
     compiled_extension = '.pyc'
@@ -164,6 +164,15 @@ def add_flags(include_flags, link_dirs, link_libs):
             recipe = Recipe.get_recipe('openssl', self.ctx)
             add_flags(recipe.include_flags(arch),
                       recipe.link_dirs_flags(arch), recipe.link_libs_flags())
+
+        if 'zlib' in self.ctx.recipe_build_order:
+            info('Activating flags for zlib')
+            recipe = Recipe.get_recipe('zlib', self.ctx)
+            add_flags(' -I' + recipe.get_build_dir(arch.arch),
+                      ' -L' + recipe.get_build_dir(arch.arch),
+                      ' -lz{}'.format(recipe.version_link))
+            env['ZLIB_VERSION'] = recipe.version
+
         return env
 
     def prebuild_arch(self, arch):

pythonforandroid/recipes/python2/__init__.py

@@ -20,7 +20,7 @@ class Python2Recipe(GuestPythonRecipe):
     url = 'https://www.python.org/ftp/python/{version}/Python-{version}.tgz'
     name = 'python2'
 
-    depends = ['hostpython2']
+    depends = ['hostpython2', 'zlib']
     conflicts = ['python3crystax', 'python3', 'python2legacy']
 
     patches = [
@@ -31,7 +31,8 @@ class Python2Recipe(GuestPythonRecipe):
                'patches/fix-filesystem-default-encoding.patch',
                'patches/fix-gethostbyaddr.patch',
                'patches/fix-posix-declarations.patch',
-               'patches/fix-pwd-gecos.patch']
+               'patches/fix-pwd-gecos.patch',
+               'patches/fix-zlib-version.patch']
 
     configure_args = ('--host={android_host}',
                       '--build={android_build}',

pythonforandroid/recipes/python2/patches/fix-missing-extensions.patch

@@ -1,15 +1,3 @@
-diff -Naurp Python-2.7.15/Modules/Setup.dist.orig Python-2.7.15/Modules/Setup.dist
---- Python-2.7.15/Modules/Setup.dist.orig	2018-04-30 00:47:33.000000000 +0200
-+++ Python-2.7.15/Modules/Setup.dist	2018-11-17 20:40:20.153518694 +0100
-@@ -464,7 +464,7 @@
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-
- # Interface to the Expat XML parser
- #
 diff -Naurp Python-2.7.15.orig/Makefile.pre.in Python-2.7.15/Makefile.pre.in
 --- Python-2.7.15.orig/Makefile.pre.in	2018-04-30 00:47:33.000000000 +0200
 +++ Python-2.7.15/Makefile.pre.in	2018-11-18 00:43:58.777379280 +0100

pythonforandroid/recipes/python2/patches/fix-zlib-version.patch

@@ -0,0 +1,37 @@
+--- Python-3.7.1/setup.py.orig	2018-10-20 08:04:19.000000000 +0200
++++ Python-3.7.1/setup.py	2019-02-17 00:24:30.715904412 +0100
+@@ -1416,7 +1416,8 @@ class PyBuildExt(build_ext):
+         if zlib_inc is not None:
+             zlib_h = zlib_inc[0] + '/zlib.h'
+             version = '"0.0.0"'
+-            version_req = '"1.1.3"'
++            version_req = '"{}"'.format(
++                os.environ.get('ZLIB_VERSION', '1.1.3'))
+             if host_platform == 'darwin' and is_macosx_sdk_path(zlib_h):
+                 zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
+             with open(zlib_h) as fp:
+@@ -1428,13 +1429,13 @@ class PyBuildExt(build_ext):
+                         version = line.split()[2]
+                         break
+             if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
++                if (self.compiler.find_library_file(lib_dirs, 'z' + os.environ.get('ZLIB_VERSION', '').replace('.', ''))):
+                     if host_platform == "darwin":
+                         zlib_extra_link_args = ('-Wl,-search_paths_first',)
+                     else:
+                         zlib_extra_link_args = ()
+                     exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z'],
++                                           libraries = ['z' + os.environ.get('ZLIB_VERSION', '').replace('.', '')],
+                                            extra_link_args = zlib_extra_link_args))
+                     have_zlib = True
+                 else:
+@@ -1448,7 +1449,7 @@ class PyBuildExt(build_ext):
+         # crc32 if we have it.  Otherwise binascii uses its own.
+         if have_zlib:
+             extra_compile_args = ['-DUSE_ZLIB_CRC32']
+-            libraries = ['z']
++            libraries = ['z' + os.environ.get('ZLIB_VERSION', '').replace('.', '')]
+             extra_link_args = zlib_extra_link_args
+         else:
+             extra_compile_args = []

pythonforandroid/recipes/python3/__init__.py

@@ -21,9 +21,10 @@ class Python3Recipe(GuestPythonRecipe):
     url = 'https://www.python.org/ftp/python/{version}/Python-{version}.tgz'
     name = 'python3'
 
-    patches = ["patches/fix-ctypes-util-find-library.patch"]
+    patches = ['patches/fix-ctypes-util-find-library.patch',
+               'patches/fix-zlib-version.patch']
 
-    depends = ['hostpython3', 'sqlite3', 'openssl', 'libffi']
+    depends = ['hostpython3', 'sqlite3', 'openssl', 'libffi', 'zlib']
     conflicts = ['python3crystax', 'python2', 'python2legacy']
 
     configure_args = (

pythonforandroid/recipes/python3/patches/fix-zlib-version.patch

@@ -0,0 +1,37 @@
+--- Python-3.7.1/setup.py.orig	2018-10-20 08:04:19.000000000 +0200
++++ Python-3.7.1/setup.py	2019-02-17 00:24:30.715904412 +0100
+@@ -1410,7 +1410,8 @@ class PyBuildExt(build_ext):
+         if zlib_inc is not None:
+             zlib_h = zlib_inc[0] + '/zlib.h'
+             version = '"0.0.0"'
+-            version_req = '"1.1.3"'
++            version_req = '"{}"'.format(
++                os.environ.get('ZLIB_VERSION', '1.1.3'))
+             if host_platform == 'darwin' and is_macosx_sdk_path(zlib_h):
+                 zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
+             with open(zlib_h) as fp:
+@@ -1422,13 +1423,13 @@ class PyBuildExt(build_ext):
+                         version = line.split()[2]
+                         break
+             if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
++                if (self.compiler.find_library_file(lib_dirs, 'z' + os.environ.get('ZLIB_VERSION', '').replace('.', ''))):
+                     if host_platform == "darwin":
+                         zlib_extra_link_args = ('-Wl,-search_paths_first',)
+                     else:
+                         zlib_extra_link_args = ()
+                     exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z'],
++                                           libraries = ['z' + os.environ.get('ZLIB_VERSION', '').replace('.', '')],
+                                            extra_link_args = zlib_extra_link_args))
+                     have_zlib = True
+                 else:
+@@ -1442,7 +1443,7 @@ class PyBuildExt(build_ext):
+         # crc32 if we have it.  Otherwise binascii uses its own.
+         if have_zlib:
+             extra_compile_args = ['-DUSE_ZLIB_CRC32']
+-            libraries = ['z']
++            libraries = ['z' + os.environ.get('ZLIB_VERSION', '').replace('.', '')]
+             extra_link_args = zlib_extra_link_args
+         else:
+             extra_compile_args = []