env2mfile: Use Debian cross-prefixed GObject-Introspection tools

In Debian testing/unstable, there are wrappers available for various GObject-Introspection tools during cross-builds, using qemu internally. Signed-off-by: Simon McVittie <[email protected]>
mesonbuild · Oct 2, 2024 · 77b46ab · 77b46ab
1 parent af50ab9
commit 77b46ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
@@ -230,6 +230,12 @@ def dpkg_architecture_to_machine_info(output: str, options: T.Any) -> MachineInf
     except ValueError:
         pass
     for tool in [
+        'g-ir-annotation-tool',
+        'g-ir-compiler',
+        'g-ir-doc-tool',
+        'g-ir-generate',
+        'g-ir-inspect',
+        'g-ir-scanner',
         'pkg-config',
     ]:
         try:

diff --git a/unittests/internaltests.py b/unittests/internaltests.py
@@ -1750,6 +1750,12 @@ def expected_binaries(gnu_tuple: str) -> T.Dict[str, T.List[str]]:
                 'cmake': ['/usr/bin/cmake'],
                 'pkg-config': [f'/usr/bin/{gnu_tuple}-pkg-config'],
                 'cups-config': ['/usr/bin/cups-config'],
+                'g-ir-annotation-tool': [f'/usr/bin/{gnu_tuple}-g-ir-annotation-tool'],
+                'g-ir-compiler': [f'/usr/bin/{gnu_tuple}-g-ir-compiler'],
+                'g-ir-doc-tool': [f'/usr/bin/{gnu_tuple}-g-ir-doc-tool'],
+                'g-ir-generate': [f'/usr/bin/{gnu_tuple}-g-ir-generate'],
+                'g-ir-inspect': [f'/usr/bin/{gnu_tuple}-g-ir-inspect'],
+                'g-ir-scanner': [f'/usr/bin/{gnu_tuple}-g-ir-scanner'],
             }
 
         for title, dpkg_arch, gccsuffix, env, expected in [