diff options
| author | Simon McVittie <smcv@debian.org> | 2024-10-02 19:23:42 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2024-10-22 01:02:36 +0300 |
| commit | 851d866349b41533d57ef8a3c3e49f01f95680e3 (patch) | |
| tree | d00acf06b55d07241d7a76ff209779db2e0e03b4 | |
| parent | 7300e4ed88286ed4fd1f3bf9f2b6b29a1f8768c0 (diff) | |
| download | meson-851d866349b41533d57ef8a3c3e49f01f95680e3.tar.gz | |
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>
| -rwxr-xr-x | mesonbuild/scripts/env2mfile.py | 6 | ||||
| -rw-r--r-- | unittests/internaltests.py | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index 16ab1b980..2a366fd19 100755 --- a/mesonbuild/scripts/env2mfile.py +++ b/mesonbuild/scripts/env2mfile.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: diff --git a/unittests/internaltests.py b/unittests/internaltests.py index 3f50ac6e0..0cf706001 100644 --- a/unittests/internaltests.py +++ b/unittests/internaltests.py @@ -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 [ |