| Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 1 | From 7be634fa9705d0367f48a91305f9acb642ff0a11 Mon Sep 17 00:00:00 2001 |
| 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> |
| 12 | --- |
| 13 | mesonbuild/modules/gnome.py | 8 ++++---- |
| 14 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 15 | |
| 16 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
| 17 | index 89d5d5d..d75f2e5 100644 |
| 18 | --- a/mesonbuild/modules/gnome.py |
| 19 | +++ b/mesonbuild/modules/gnome.py |
| 20 | @@ -739,17 +739,17 @@ class GnomeModule(ExtensionModule): |
| 21 | if giscanner.found(): |
| 22 | giscanner_path = giscanner.get_command()[0] |
| 23 | if not any(x in giscanner_path for x in gi_util_dirs_check): |
| 24 | - giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) |
| 25 | + giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) |
| 26 | else: |
| 27 | - giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) |
| 28 | + giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) |
| 29 | |
| 30 | gicompiler = self.interpreter.find_program_impl('g-ir-compiler') |
| 31 | if gicompiler.found(): |
| 32 | gicompiler_path = gicompiler.get_command()[0] |
| 33 | if not any(x in gicompiler_path for x in gi_util_dirs_check): |
| 34 | - gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) |
| 35 | + gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) |
| 36 | else: |
| 37 | - gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) |
| 38 | + gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) |
| 39 | |
| 40 | ns = kwargs.pop('namespace') |
| 41 | nsversion = kwargs.pop('nsversion') |