8b0aeafce2
Currently, meson hard codes the paths of these binaries which results in cross-compiled environments to run the host versions of these tools. However, GObject-introspection provides the appropriate paths to these utilities via pkg-config find_program is needed in the case g-i is built as a subproject. If g-ir-scanner or g-ir-compiler are in the build or source directory use those. If they aren't found in the source directory, use the results from pkg-config. Backport two upstream commits to fix the issue. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Tested-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
63 lines
3.0 KiB
Diff
63 lines
3.0 KiB
Diff
From f66b04b0996eae5cd7b0ad007435d5a51f28b691 Mon Sep 17 00:00:00 2001
|
|
From: Adam Duskett <Aduskett@gmail.com>
|
|
Date: Mon, 24 Feb 2020 06:29:26 -0800
|
|
Subject: [PATCH] gobject-introspection: determine g-ir-scanner and
|
|
g-ir-compiler paths from pkgconfig
|
|
|
|
Currently, meson hard codes the paths of these binaries which results in
|
|
cross-compiled environments to run the host versions of these tools.
|
|
However, GObject-introspection provides the appropriate paths to these
|
|
utilities via pkg-config
|
|
|
|
find_program is needed in the case g-i is built as a subproject. If
|
|
g-ir-scanner or g-ir-compiler are in the build or source directory use those.
|
|
If they aren't found in the source directory, use the results from pkg-config.
|
|
|
|
Upstream commit: f66b04b0996eae5cd7b0ad007435d5a51f28b691
|
|
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
|
---
|
|
mesonbuild/modules/gnome.py | 21 ++++++++++++++++++---
|
|
1 file changed, 18 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
|
index 3d5d7181..0ea4b273 100644
|
|
--- a/mesonbuild/modules/gnome.py
|
|
+++ b/mesonbuild/modules/gnome.py
|
|
@@ -736,15 +736,30 @@ class GnomeModule(ExtensionModule):
|
|
if kwargs.get('install_dir'):
|
|
raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"')
|
|
|
|
- giscanner = self.interpreter.find_program_impl('g-ir-scanner')
|
|
- gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
|
|
-
|
|
girtargets = [self._unwrap_gir_target(arg, state) for arg in args]
|
|
|
|
if len(girtargets) > 1 and any([isinstance(el, build.Executable) for el in girtargets]):
|
|
raise MesonException('generate_gir only accepts a single argument when one of the arguments is an executable')
|
|
|
|
self.gir_dep, pkgargs = self._get_gir_dep(state)
|
|
+ # find_program is needed in the case g-i is built as subproject.
|
|
+ # In that case it uses override_find_program so the gobject utilities
|
|
+ # can be used from the build dir instead of from the system.
|
|
+ # However, GObject-introspection provides the appropriate paths to
|
|
+ # these utilities via pkg-config, so it would be best to use the
|
|
+ # results from pkg-config when possible.
|
|
+ gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()]
|
|
+ giscanner = self.interpreter.find_program_impl('g-ir-scanner')
|
|
+ if giscanner.found():
|
|
+ giscanner_path = giscanner.get_command()[0]
|
|
+ if not any(x in giscanner_path for x in gi_util_dirs_check):
|
|
+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
|
|
+
|
|
+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
|
|
+ if gicompiler.found():
|
|
+ gicompiler_path = gicompiler.get_command()[0]
|
|
+ if not any(x in gicompiler_path for x in gi_util_dirs_check):
|
|
+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
|
|
|
|
ns = kwargs.pop('namespace')
|
|
nsversion = kwargs.pop('nsversion')
|
|
--
|
|
2.20.1
|
|
|