diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 18:19:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 18:24:36 +0200 |
| commit | 97b4c3d27bbad67f21993647c20df342691af9be (patch) | |
| tree | 86956d347e2985cd36db22b38fd79347f834b0c8 /python3 | |
| parent | 8b1bd600cd112d97ea77b155db94a1f56f2e11aa (diff) | |
Revert "python3: build against internal zlib when that is requested"
Internal zlib is not really supported anyway on any platform that uses
setup.py.
This reverts commit 6afe0e5804f2a23f9fc9842d372fff77fd1023f1.
Change-Id: Icf94a85c4baf00df54ee5dcca5fe3ca4a63a54a8
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/UnpackedTarball_python3.mk | 8 | ||||
| -rw-r--r-- | python3/python-3.3.0-zlib.patch.1 | 43 |
2 files changed, 0 insertions, 51 deletions
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index 37cf3aa17430..0d5fce5e6236 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -34,14 +34,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-pythreadstate.patch.1 \ )) -ifneq ($(COM),MSC) -ifeq ($(SYSTEM_ZLIB),NO) -$(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/python-3.3.0-zlib.patch.1 \ -)) -endif -endif - ifneq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-15833.patch.1 \ diff --git a/python3/python-3.3.0-zlib.patch.1 b/python3/python-3.3.0-zlib.patch.1 deleted file mode 100644 index a3091ffb79fe..000000000000 --- a/python3/python-3.3.0-zlib.patch.1 +++ /dev/null @@ -1,43 +0,0 @@ -sadly python's build system is so awful it needs patching to find internal zlib - ---- python3/setup.py 2013-05-08 13:42:03.826304937 +0200 -+++ python3/setup.py 2013-05-08 13:57:53.027231320 +0200 -@@ -1332,7 +1332,11 @@ - # - # 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) -+ if os.environ.get('SYSTEM_ZLIB') == 'NO': -+ zlib_incdir = os.environ.get('WORKDIR') + '/' + '/UnpackedTarball/zlib/' -+ zlib_inc = find_file('zlib.h', inc_dirs, [zlib_incdir]) -+ else: -+ zlib_inc = find_file('zlib.h', [], inc_dirs) - have_zlib = False - if zlib_inc is not None: - zlib_h = zlib_inc[0] + '/zlib.h' -@@ -1347,13 +1351,23 @@ - version = line.split()[2] - break - if version >= version_req: -- if (self.compiler.find_library_file(lib_dirs, 'z')): -+ if os.environ.get('SYSTEM_ZLIB') == 'NO': -+ zlib_lib = 'zlib' -+ zlib_libdir = os.environ.get('OUTDIR') + '/' + 'lib' -+# zlib_found = find_library_file(self.compiler, zlib_lib, lib_dirs, [zlib_libdir]) -+ zlib_found = [zlib_libdir] -+ else: -+ zlib_lib = 'z' -+ zlib_found = self.compiler.find_library_file(lib_dirs, zlib_lib) -+ if zlib_found: - 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 = [zlib_lib], -+ include_dirs = zlib_inc, -+ library_dirs = zlib_found, - extra_link_args = zlib_extra_link_args)) - have_zlib = True - else: |