Skip to content

Commit 873b73a

Browse files
committed
downloads: upgrade zlib 1.2.12 -> 1.2.13
This required adding `--static` to `configure` because of changes to configure respecting CC. This caused symbol visibility issues, which prevented a shared library from linking. We don't use the shared library. So it should be safe to just not build it.
1 parent a7b5f3f commit 873b73a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

cpython-unix/build-zlib.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ tar -xf zlib-${ZLIB_VERSION}.tar.gz
1313

1414
pushd zlib-${ZLIB_VERSION}
1515

16-
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure --prefix=/tools/deps
16+
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure \
17+
--prefix=/tools/deps \
18+
--static
1719
make -j ${NUM_CPUS}
1820
make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out

pythonbuild/downloads.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@
330330
"license_public_domain": True,
331331
},
332332
"zlib": {
333-
"url": "https://zlib.net/fossils/zlib-1.2.12.tar.gz",
334-
"size": 1490071,
335-
"sha256": "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9",
336-
"version": "1.2.12",
333+
"url": "https://zlib.net/fossils/zlib-1.2.13.tar.gz",
334+
"size": 1497445,
335+
"sha256": "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30",
336+
"version": "1.2.13",
337337
"library_names": ["z"],
338338
"licenses": ["Zlib"],
339339
"license_file": "LICENSE.zlib.txt",

0 commit comments

Comments
 (0)