diff options
| author | David Tardon <dtardon@redhat.com> | 2016-11-03 17:16:29 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-11-04 16:22:23 +0100 |
| commit | b2c16b3563a4a8e4b54f6fc0cb1be597e7c5b27d (patch) | |
| tree | 2486d90e057fda8b78ca08d135a210edd4e7eb4b /external | |
| parent | c9fdaa1d2108686cb399122dd665584bb7343a0c (diff) | |
fix build of bundled python3 with bundled zlib
Change-Id: I383a04ea926187263b1d7e11c548817fa9ca3fb6
Diffstat (limited to 'external')
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 1 | ||||
| -rw-r--r-- | external/python3/internal-zlib.patch.0 | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index ef9246e49b6b..fefdd1ab3adf 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -99,6 +99,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : )" \ && MAKEFLAGS= $(MAKE) \ $(if $(filter MACOSX,$(OS)),DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \ + $(if $(SYSTEM_ZLIB),,ZLIB_INCDIR=$(WORKDIR)/UnpackedTarball/zlib) \ && ln -s build/lib.* LO_lib \ ) diff --git a/external/python3/internal-zlib.patch.0 b/external/python3/internal-zlib.patch.0 index d045f468231c..abe2630bd2e7 100644 --- a/external/python3/internal-zlib.patch.0 +++ b/external/python3/internal-zlib.patch.0 @@ -19,6 +19,15 @@ --- setup.py +++ setup.py +@@ -1362,7 +1362,7 @@ + # + # You can upgrade zlib to version 1.1.4 yourself by going to + # http://www.gzip.org/zlib/ +- zlib_inc = find_file('zlib.h', [], inc_dirs) ++ zlib_inc = [os.environ.get('ZLIB_INCDIR')] + have_zlib = False + if zlib_inc is not None: + zlib_h = zlib_inc[0] + '/zlib.h' @@ -1379,13 +1379,13 @@ version = line.split()[2] break |