libpkg: allow filtering provided shlibs #2422
Open
Conversation
This file contains 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
Sponsored by: The FreeBSD Foundation
Sponsored by: The FreeBSD Foundation
This is consistent with the behavior for required shlibs and will make the next commit simpler to implement correctly. Sponsored by: The FreeBSD Foundation
This allows limiting the files in a package that can affect shlibs_provided when ELF files are scanned during e.g. pkg create. The ports system will be able to populate these options automatically based on the already existing USE_LDCONFIG variable. Sponsored by: The FreeBSD Foundation
These are quite simple to implement and nicely complement the
SHLIB_REQUIRE_IGNORE_{GLOB,REGEX} options.
Sponsored by: The FreeBSD Foundation
|
Looks like the macos CI is broken due to some upstream homebrew? issue. |
arrowd
reviewed
Feb 17, 2025
| ATF_REQUIRE_EQ(tll_length(p->shlibs_provided), 0); | ||
| ATF_REQUIRE_EQ(pkg_analyse_elf(false, p, binpath), EPKG_OK); | ||
| ATF_REQUIRE_EQ(tll_length(p->shlibs_provided), 1); | ||
| ATF_REQUIRE_STREQ(tll_front(p->shlibs_provided), "libtestfbsd.so.1"); |
There was a problem hiding this comment.
This test stopped checking if libtestfbsd.so.1 is provided, which changes its behavior. Is this intended?
There was a problem hiding this comment.
This is intended, the analyze_elf() function now works differently and does not directly add entries to p->shlibs_provided. Instead, the provided shlib is returned with an out parameter and pkg_analyze_files() decides whether or not it should be filtered out.
This filtering cannot be done in analyze_elf() directly as pkg_analyze_files() must be aware of all shlibs provided by the package including filtered shlibs so that it can eliminate redundant shlibs_required entries.
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.
This branch adds several useful ways to filter the shared libraries automatically added to
shlibs_providedby a pkg based on parsing the ELF/Mach-O binary. These two commits are the most relevant: