| From 0b860cb8a22ae876b6088939dbabca216bc29431 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 | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
| index b29bab9..dc4c401 100644 |
| --- a/mesonbuild/modules/gnome.py |
| +++ b/mesonbuild/modules/gnome.py |
| @@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule): |
| raise MesonException('Gir takes one argument') |
| 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') |
| girtarget = args[0] |
| while hasattr(girtarget, 'held_object'): |
| girtarget = girtarget.held_object |
| @@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule): |
| self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', |
| state.environment, |
| {'native': True}) |
| + 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', {}) |
| pkgargs = self.gir_dep.get_compile_args() |
| except Exception: |
| raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') |