Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 9ccaed380780178c4dab3a681f652ac7cd27452d Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 4 Aug 2017 16:18:47 +0300 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] gobject-introspection: determine g-ir-scanner and |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | g-ir-compiler paths from pkgconfig |
| 6 | |
| 7 | Do not hardcode the name of those binaries; gobject-introspection |
| 8 | provides them via pkgconfig, and they can be set to something else |
| 9 | (for example when cross-compiling). |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 13 | |
| 14 | --- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 15 | mesonbuild/modules/gnome.py | 6 +++--- |
| 16 | 1 file changed, 3 insertions(+), 3 deletions(-) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 17 | |
| 18 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 19 | index 7c5a363..0002498 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 20 | --- a/mesonbuild/modules/gnome.py |
| 21 | +++ b/mesonbuild/modules/gnome.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 22 | @@ -744,15 +744,15 @@ class GnomeModule(ExtensionModule): |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 23 | if kwargs.get('install_dir'): |
| 24 | raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 25 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | - giscanner = self.interpreter.find_program_impl('g-ir-scanner') |
| 27 | - gicompiler = self.interpreter.find_program_impl('g-ir-compiler') |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 28 | - |
| 29 | girtargets = [self._unwrap_gir_target(arg, state) for arg in args] |
| 30 | |
| 31 | if len(girtargets) > 1 and any([isinstance(el, build.Executable) for el in girtargets]): |
| 32 | raise MesonException('generate_gir only accepts a single argument when one of the arguments is an executable') |
| 33 | |
| 34 | self.gir_dep, pkgargs = self._get_gir_dep(state) |
| 35 | + giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) |
| 36 | + gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) |
| 37 | + |
| 38 | |
| 39 | ns = kwargs.pop('namespace') |
| 40 | nsversion = kwargs.pop('nsversion') |