[V2 RESEND] gnome: support generate_gir on cross builds #14933
+72
−24
Conversation
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
The gobject-introspection subproject just registers g-ir-scanner as a python script, with meson unaware of the native module the script depends upon that has to be built first. This patch works around this issue by adding an the gobject-introspection-1.0 dependency (which indirectly depends on the native module) if g-ir-scanner was overriden by the g-i subproject.
This was added on dcbaker request[0], but doesn't actually work the way we need it too, as meson always has too assume the tools from the pkg-config file are build machine tools. [0]:mesonbuild#14422 (comment)
|
@sp1ritCS please rebase |
|
It might make sense to yield this until #15101 is merged and revisit this to see if (a subset of) it is still needed. I haven't verified it, but based on testing with #15101, its very possible that the only reason this PR worked is due to g-ir-scanner/g-ir-compiler picking up GIRs from the system installation, even tho they don't match the target architecture. I guess that won't happen in the current release cycle, given that you and @xclaesse are currently busy with the rust/cargo stuff, but its going to be better that way. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
See #14930, #14865