| From 9ccaed380780178c4dab3a681f652ac7cd27452d Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex.kanavin@gmail.com> |
| Date: Fri, 4 Aug 2017 16:18:47 +0300 |
| Subject: [PATCH] gobject-introspection: determine g-ir-scanner and |
| g-ir-compiler paths from pkgconfig |
| |
| Do not hardcode the name of those binaries; gobject-introspection |
| provides them via pkgconfig, and they can be set to something else |
| (for example when cross-compiling). |
| |
| Upstream-Status: Pending |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| |
| --- |
| mesonbuild/modules/gnome.py | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
| index 7c5a363..0002498 100644 |
| --- a/mesonbuild/modules/gnome.py |
| +++ b/mesonbuild/modules/gnome.py |
| @@ -744,15 +744,15 @@ 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) |
| + giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) |
| + gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) |
| + |
| |
| ns = kwargs.pop('namespace') |
| nsversion = kwargs.pop('nsversion') |