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 <smcv@debian.org>
pull/13813/head
Simon McVittie 2 months ago committed by Jussi Pakkanen
parent 7300e4ed88
commit 851d866349
  1. 6
      mesonbuild/scripts/env2mfile.py
  2. 6
      unittests/internaltests.py

@ -231,6 +231,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:

@ -1750,6 +1750,12 @@ class InternalTests(unittest.TestCase):
'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 [

Loading…
Cancel
Save