Repository navigation
gh-141600: fix musl detection on Void Linux - #141602
zware merged 1 commit into
Conversation
Sorry, something went wrong.
|
All commit authors signed the Contributor License Agreement. |
Sorry, something went wrong.
|
!buildbot Alpine |
Sorry, something went wrong.
|
🤖 New build scheduled with the buildbot fleet by @zware for commit 87f95c1 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F141602%2Fmerge The command will test the builders whose names match following regular expression: Alpine The builders matched are:
|
Sorry, something went wrong.
| | (libc(_\w+)?\.so(?:\.(\d[0-9.]*))?) | ||
| | (musl-([0-9.]+)) | ||
| | (libc.musl(?:-\w+)?.so(?:\.(\d[0-9.]*))?) | ||
| | ((?:libc.|ld-)musl(?:-\w+)?.so(?:\.(\d[0-9.]*))?) |
There was a problem hiding this comment.
There is a bug in the existing regex, it should be libc\. instead of libc., no?
| | ((?:libc.|ld-)musl(?:-\w+)?.so(?:\.(\d[0-9.]*))?) | |
| | ((?:libc\.|ld-)musl(?:-\w+)?.so(?:\.(\d[0-9.]*))?) |
Sorry, something went wrong.
There was a problem hiding this comment.
I saw the bug and thought about fixing it, but then I wondered what esoteric musl-based distribution would break if the regex gets more specific. If this is not a concern, we can quote the dot.
Sorry, something went wrong.
There was a problem hiding this comment.
If later we discover Linux distributions where musl is not properly detected, we can update the regex again. For now, I would prefer to use a strict libc\..
Sorry, something went wrong.
There was a problem hiding this comment.
Done.
Sorry, something went wrong.
|
GH-141850 is a backport of this pull request to the 3.14 branch. |
Sorry, something went wrong.
This patch amends the search patterns in the function platform.libc_ver to properly recognize musl on Void Linux. Unlike Alpine, Void does not provide a libc.musl symlink that points to the linker, so executables link to a generic (and unversioned) libc.so, which is just a symlink to the linker at ld-musl-${arch}.so.${version}. By slightly modifying the pattern to accept ld-musl in addition to libc.musl, the function will pick up the linker encoded in executable rather than the generic C library path.
This patch also prevents a match against libc.so from setting the returned library name to libc when the library name has already been set to glibc or musl. Previously, the exclusion only applied when the library name was already set to glibc. This change is necessary because the pattern matching will pick up Void's generic libc.so after it has picked up the ld-linux linker path.
Finally, a unit test that relies (via the linked_to_musl function) on the version returned by libc_ver has been amended to accept a returned version consisting only of a single major number in addition to a complete full (major, minor, patch) triplet. The patterns admit the possibility that only the major version is known, so this must be accommodated.