8000 [3.9] gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) (… · python/cpython@24c6514 · GitHub
[go: up one dir, main page]
Skip to content

Commit 24c6514

Browse files
ambvzware
ambv
and
zware
authored
[3.9] gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) (GH-115087)
(cherry picked from commit 618d725) Co-authored-by: Zachary Ware <zach@python.org>
1 parent 8fc8c45 commit 24c6514

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

‎Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Windows builds to use zlib v1.3.1.

‎PCbuild/get_externals.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.0
6060
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
6161
set libraries=%libraries% xz-5.2.5
62-
set libraries=%libraries% zlib-1.2.12
62+
set libraries=%libraries% zlib-1.3.1
6363

6464
for %%e in (%libraries%) do (
6565
if exist "%EXTERNALS_DIR%\%%e" (

‎PCbuild/python.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1w\$(ArchName)\</opensslOutDir>
7373
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
7474
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
75-
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.12\</zlibDir>
75+
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
7676
</PropertyGroup>
7777

7878
<PropertyGroup>

0 commit comments

Comments
 (0)
0