fixes for settings plugins #4213
Merged
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
Rust 1.81.0 has started setting the soname for cdylib artifacts it builds, which now matches the library's name provided by the crate. These library names could all be the same, but in practice should be distinct within the workspace to prevent cdylib artifacts from being overwritten when building two or more crates that share a library name. If a soname is not specified, then glibc's dynamic linker will treat the library's filename as its soname. If a soname is specified, then that will always be used regardless of the filename. Both the settings plugin loader code and the ld.so.conf.d drop-ins expect that we can install each crate's cdylib as "libsettings.so" and have the dynamic linker find the right library at runtime. To keep this working as expected, add a new linker argument so the embedded soname ends up as "libsettings.so", to match the filename. Signed-off-by: Ben Cressey <bcressey@amazon.com>
This is only needed at build time, not at runtime. Signed-off-by: Ben Cressey <bcressey@amazon.com>
sam-berning
approved these changes
Sep 20, 2024
arnaldo2792
approved these changes
Sep 24, 2024
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.
Issue number:
Related: bottlerocket-os/bottlerocket-sdk#204
Description of changes:
Drop the runtime requirement on
glibc-devel, which results in unnecessary header files and static library archives on the final system.Work around a behavior change in Rust 1.81.0 where the soname is now set for cdylib artifacts. We need the soname to stay "libsettings.so" for compatibility reasons.
Testing done:
Verified that the soname was set as expected.
Also verified that the settings plugins were correctly loaded on variants built with both the older and newer Rust toolchains.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.