diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-04 13:27:31 +0100 |
commit | 7b2ae9881f189781d30460dcca4432181fd4bce8 (patch) | |
tree | e65cd91f3cb93ec2366e6a30594c71675767cad2 /meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | |
parent | 3ec2330acf6cf84f9030cd3358813170fb3ceff0 (diff) | |
download | poky-7b2ae9881f189781d30460dcca4432181fd4bce8.tar.gz |
meson: upgrade 0.53.2 -> 0.54.2
Drop 0001-mesonbuild-environment.py-check-environment-for-vari.patch
as upstream has refactored the code.
(From OE-Core rev: 1264edce86cafaa64428bb42844437ac4de7df3a)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch new file mode 100644 index 0000000000..35c18f0785 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | |||
@@ -0,0 +1,41 @@ | |||
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') | ||