-
-
Notifications
You must be signed in to change notification settings - Fork 32.8k
gh-90548: Fix musl version detection with --strip-all #137864
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.
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The added pattern seems ostensibly reasonable.
Co-authored-by: Adam Turner <[email protected]>
@AA-Turner I believe the |
I already added the backport label. Anything else missing?
Fair enough, though "linux" is sufficiently vague that I think it is probably fine. Ideally we'd have a "libc-musl" label, but given as you say Alpine is unsupported, it's too niche at present. |
No, all good. I just wasn't sure if a fix for an unsupported platform meant it couldn't be backported. |
FWIW we have a "musl" section in the Unsupported platforms project. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…-137864) (cherry picked from commit 6528cf4) Co-authored-by: Marc Mueller <[email protected]> Co-authored-by: Adam Turner <[email protected]>
GH-138348 is a backport of this pull request to the 3.14 branch. |
Merged, thanks for the fix and added tests! |
…) (#138348) Co-authored-by: Marc Mueller <[email protected]> Co-authored-by: Adam Turner <[email protected]>
The change introduced in #131313 accidentally broke the musl version detection for
test.support.linked_with_musl
if cpython is compiled with--strip-all
. In these cases the regex inplatform.libc_ver
should match the filename:libc.musl-x86_64.so.1
.https://pkgs.alpinelinux.org/contents?file=libc.*&path=&name=musl&branch=edge&repo=main&arch=
--strip-all
is used among other things by the Alpine based Python docker image.https://github.com/docker-library/python/blob/19c93d12094b07ecc21f67144a309c2fa0a10ef0/3.14-rc/alpine3.22/Dockerfile#L74
With this change:
/CC @bitdancer