]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877)
authorZachary Ware <zach@python.org>
Thu, 1 Feb 2024 23:54:02 +0000 (17:54 -0600)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2024 23:54:02 +0000 (17:54 -0600)
Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst [new file with mode: 0644]
PCbuild/get_externals.bat
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 (file)
index 0000000..ea82c3b
--- /dev/null
@@ -0,0 +1 @@
+Update Windows builds to use zlib v1.3.1.
index 3919c0592ec00d01e1caa4e38918c795dcd6706b..de73d923d8f4df18d2c7642913050c1cf2fb58ac 100644 (file)
@@ -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" (
index e8796081c4eaf372c58d59c6d64043ab9398c9cf..2cb16693e546b1b9d463078a30d5ca05d995293d 100644 (file)
@@ -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>