diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-02-28 16:36:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-02 14:15:33 +0000 |
commit | 02f2ecabc3007a143f7b9b278820c7981ecee99a (patch) | |
tree | f114272baef1a7b546d8e5ac6f40ee8849d378b1 /meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | |
parent | ecabf7386fce5f1af93215b7c3b47291e4d63cb3 (diff) | |
download | poky-02f2ecabc3007a143f7b9b278820c7981ecee99a.tar.gz |
meson: update 0.56.2 -> 0.57.1
Replace hacky 0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
with entries in meson.cross.
Rest of the patches are refreshed.
(From OE-Core rev: 85b4aea551ac4a0f47f916957dd9707c81813a2b)
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 | 37 |
1 files changed, 0 insertions, 37 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 deleted file mode 100644 index a1f8422d44..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 64aa6718c290e150dafd8da83f31cb08af00af0e 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 | --- | ||
14 | mesonbuild/modules/gnome.py | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py | ||
18 | index 52016f4..2b72ee4 100644 | ||
19 | --- a/mesonbuild/modules/gnome.py | ||
20 | +++ b/mesonbuild/modules/gnome.py | ||
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 | ||