Repository navigation
Libc (FreeBSD): uses base objdump to detect libc version - #2711
Merged
Merged
Conversation
The FBSD version was only detected when binutils' /usr/local/bin/objdump was installed. Supported FreeBSD releases ship llvm-objdump as /usr/bin/objdump in base, which gives the same result, so try it first like MidnightBSD already does and keep /usr/local/bin/objdump as a fallback. DragonFly sets FreeBSD too, so exclude it from both branches. Until now the FreeBSD branch caught DragonFly first and the DF version was never detected.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The FBSD libc version (shown as
libcby the Version module) is only detected atconfigure time when binutils'
/usr/local/bin/objdumpis installed. SupportedFreeBSD releases ship llvm-objdump as
/usr/bin/objdumpin base, and it gives thesame result. Without binutils, which is the normal case in a clean poudriere jail,
the version is silently left out.
DragonFly sets
FreeBSDtoo, so theelseif(FreeBSD ...)branch has been catchingit before the DragonFly branch, and
FF_DF_VERSIONwas never set.Related issue (required for new logos for new distros)
None.
Changes
/usr/bin/objdumpfirst on FreeBSD (the existing MidnightBSD branch, nowFreeBSD AND NOT DragonFly, which still covers MidnightBSD), and keep/usr/local/bin/objdumpas the fallback.# Unreleased.Screenshots
N/A
Checklist
Tested on FreeBSD 15.1-RELEASE/powerpc64 (POWER9):
git amon dev cad01fd,cmake --trace-expandshows the/usr/bin/objdumpbranch running, configure printsFound FBSD 1.9,fastfetch --format json -s Versionreports"libc": "FBSD 1.9",ctest 20/20,
presets/all.jsoncruns. Base/usr/bin/objdump -T /lib/libc.so.*also gives
FBSD_1.8on 14.4. DragonFly and MidnightBSD were not tested; theMidnightBSD path is unchanged.