8000 [3.11] gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) by miss-islington · Pull Request #115080 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.11] gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) #115080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2024
Merged

[3.11] gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) #115080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) 
(cherry picked from commit 618d725)

Co-authored-by: Zachary Ware <zach@python.org>
  • Loading branch information
@zware @miss-islington
zware authored and miss-islington committed Feb 6, 2024
commit 3108e58b6f60f5e7cc7a45442b86d685ebfa698f
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2024-02-01-14-35-05.gh-issue-111239.SO7SUF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows builds to use zlib v1.3.1.
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
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" (
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.13\$(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>
Expand Down
0