https://github.com/python/cpython/commit/618d7256e78da8200f6e2c6235094a1ef885dca4
commit: 618d7256e78da8200f6e2c6235094a1ef885dca4
branch: main
author: Zachary Ware <[email protected]>
committer: zware <[email protected]>
date: 2024-02-01T17:54:02-06:00
summary:
gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877)
files:
A Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst
M PCbuild/get_externals.bat
M PCbuild/python.props
diff --git
a/Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst
b/Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst
new file mode 100644
index 00000000000000..ea82c3b941f802
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst
@@ -0,0 +1 @@
+Update Windows builds to use zlib v1.3.1.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 3919c0592ec00d..de73d923d8f4df 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=%libraries%
sqlite-3.44.2.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries%
tcl-core-8.6.13.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.1
set libraries=%libraries% xz-5.2.5
-set libraries=%libraries% zlib-1.2.13
+set libraries=%libraries% zlib-1.3.1
for %%e in (%libraries%) do (
if exist "%EXTERNALS_DIR%\%%e" (
diff --git a/PCbuild/python.props b/PCbuild/python.props
index e8796081c4eaf3..2cb16693e546b1 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -78,7 +78,7 @@
<opensslOutDir Condition="$(opensslOutDir) ==
''">$(ExternalsDir)openssl-bin-3.0.11\$(ArchName)\</opensslOutDir>
<opensslIncludeDir Condition="$(opensslIncludeDir) ==
''">$(opensslOutDir)include</opensslIncludeDir>
<nasmDir Condition="$(nasmDir) ==
''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
- <zlibDir Condition="$(zlibDir) ==
''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
+ <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
</PropertyGroup>
<PropertyGroup>
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
