Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 1 | From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 27 May 2020 16:43:05 +0000 |
| 4 | Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR |
| 5 | |
| 6 | When using sysroots for builds, the standard target paths for the |
| 7 | tools need to be prefixed (pkg-config is not clever enough to |
| 8 | determine when a custom variable is a path) |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 12 | |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 13 | --- |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 14 | mesonbuild/modules/gnome.py | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 16 | |
| 17 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 18 | index 52016f4..2b72ee4 100644 |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 19 | --- a/mesonbuild/modules/gnome.py |
| 20 | +++ b/mesonbuild/modules/gnome.py |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 21 | @@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule): |
| 22 | if giscanner is not None: |
| 23 | self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner) |
| 24 | elif self.gir_dep.type_name == 'pkgconfig': |
| 25 | - self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) |
| 26 | + self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) |
| 27 | else: |
| 28 | self.giscanner = self.interpreter.find_program_impl('g-ir-scanner') |
| 29 | gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') |
| 30 | if gicompiler is not None: |
| 31 | self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler) |
| 32 | elif self.gir_dep.type_name == 'pkgconfig': |
| 33 | - self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) |
| 34 | + self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) |
| 35 | else: |
| 36 | self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler') |
| 37 | return self.gir_dep, self.giscanner, self.gicompiler |