Always calculate libdir #588
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
flatpak-builder relies on patched cmake and meson from freedesktop-sdk to change libdir from lib64 to lib on 64bit distributions. This dependency is *weird* since it's actually flatpak that sets up the dynamic linker paths. Instead, put responsibility for setting up correct libdir to flatpak-builder always.
|
Not sure whether there's a risk that always passing libdir breaks something. |
|
I think this is fine. I tested cmake, autotools, and meson. If you pass libdir twice the second one always wins, so manifests with custom values will still be respected. And in practice the default with fdo was this so I don't see an issue. |
|
It's not actually set twice. (assuming app author is using flatpak-builder libdir functionality) New logic is:
The step 3 is new, steps 1 and 2 were there already. |
|
I don't mean we set it twice. Just an old manifest may have set it manually itself. |
This was referenced Jul 4, 2024
alatiera
added a commit
to alatiera/org.gnome.Builder
that referenced
this pull request
Jul 5, 2024
This will be required to build apps using 24.08 base runtimes and newer. flatpak/flatpak-builder#588
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.
flatpak-builder relies on patched cmake and meson from
freedesktop-sdk to change libdir from lib64 to lib on 64bit
distributions. This dependency is weird since it's actually
flatpak that sets up the dynamic linker paths. Instead, put
responsibility for setting up correct libdir to flatpak-builder
always.