Avoid gobject-introspection dependency except if g-ir-scanner is from subproject #14930
+21
−11
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.
|
Can this be merged in 1.10 (and possibly to 1.9.1) after #14929 has gone to master? |
|
With the release so close I'd like to get it done with minimal changes. |
I'd require me to fix up gtk and pango, since they currently do a |
|
Okay, let's do that then. Sorry about the extra work, but that's just how things go sometimes. |
|
Argh, I merged this by accident. Sorry. |
|
The GH web ui does not seem to handle the case when a merged PR is backed out. You'll need to open a new one for this. My bad. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This is an alternative to #14929, that retains the ability for gir generation during cross compilation.
I did validate, that this manages to properly build
subprojects/gstreamer/gst/Gst-1.0.gir, where as a checkout of 97c4e9d did fail withModuleNotFoundError: No module named 'giscanner._giscanner'; it might be a good idea for @amyspark to check that it works too.If this were merged instead of #14929, we'd still need the fix from #14865 in order to prevent unexecutable
ExternalExecutablesfrom being created due to mismatching architectures.See #14908