WebSafe 3.7github.com
|
|
🏠
Skip to content

GH-132983: Build _zstd on Windows#133366

Merged
AA-Turner merged 7 commits intopython:mainfrom
AA-Turner:zstandard-pc
May 5, 2025
Merged

GH-132983: Build _zstd on Windows#133366
AA-Turner merged 7 commits intopython:mainfrom
AA-Turner:zstandard-pc

Conversation

@AA-Turner
Copy link
Member

@AA-Turner AA-Turner commented May 4, 2025

Per the documentation in zlib/lib, we build lib/common, lib/compress, lib/decompress, and lib/dictBuilder.

Building lib/legacy is noted as optional to support decompression only of archives created with Zstd 0.8 (2016) or earlier. That release is 10 years old, so for simplicity I chose not to build it, but we could add it in if thought useful.

A

@emmatyping
Copy link
Member

emmatyping commented May 4, 2025

Oh this is great! I had a branch with similar changes that I hadn't gotten to making a PR, but this looks good! Thank you for proposing it.

Building lib/legacy is noted as optional to support decompression only of archives created with Zstd 0.8 (2016) or earlier. That release is 10 years old, so for simplicity I chose not to build it, but we could add it in if thought useful.

I don't think the current code currently or will use it, so I think it is fine to exclude.

Copy link
Member

@emmatyping emmatyping left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@AA-Turner

This comment was marked as resolved.

@bedevere-bot

This comment was marked as resolved.

@AA-Turner AA-Turner force-pushed the zstandard-pc branch 3 times, most recently from 955650f to df19f59 Compare May 4, 2025 20:27
@AA-Turner

This comment was marked as resolved.

@bedevere-bot

This comment was marked as resolved.

@AA-Turner

This comment was marked as resolved.

@AA-Turner
Copy link
Member Author

cc @zooba -- please could I ask for a quick once-over of the build changes in this PR? I'm fairly confident in them, but would be good to have a review.

A

Copy link
Member

@zooba zooba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me, though I'm not sure we need a separate project for zstd? We should be able to reference all the files directly through _zstd (we couldn't for zlib-ng because their build process is way too complex to integrate into pythoncore, but this one looks pretty simple and already has its own extension module that's separate).

@emmatyping

This comment was marked as resolved.

@zooba

This comment was marked as resolved.

Copy link
Contributor

@sethmlarson sethmlarson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SBOM changes LGTM, thank you!

AA-Turner added 3 commits May 5, 2025 23:30
MSB8027: Two or more files with the name of zdict.c will produce outputs to the same location. This can lead to an incorrect build result.  The files involved are ..\Modules\_zstd\zdict.c, \externals\zstd-1.5.7\lib\dictBuilder\zdict.c.
@AA-Turner AA-Turner added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label May 5, 2025
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @AA-Turner for commit 1ae3a76 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F133366%2Fmerge

If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label May 5, 2025
Copy link
Member

@zooba zooba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Merge whenever you're ready

@AA-Turner
Copy link
Member Author

Note for others: because we now build zstd as one project, we can't have name collisions, so we've renamed Modules\zdict.c to Modules\zstddict.c.

@AA-Turner AA-Turner merged commit e6f8e0a into python:main May 5, 2025
67 of 75 checks passed
@AA-Turner AA-Turner deleted the zstandard-pc branch May 5, 2025 23:58
zanieb added a commit to astral-sh/python-build-standalone that referenced this pull request Jun 4, 2025
- python/cpython#133027
- python/cpython#133366
- python/cpython#133284
- python/cpython#133398
- python/cpython#131298
- python/cpython#132438
- python/cpython#133012

---------

Co-authored-by: Wingy <git@wingysam.xyz>
Co-authored-by: Geoffrey Thomas <geofft@ldpreload.com>
Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

5 participants

Comments