summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/gi-target-dep.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-09-08 20:01:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-11 18:41:37 +0100
commitf33e81a64395666a3cbb5b9ef299606c3b8052f3 (patch)
tree2fd42d783a818fb7da5c8a3cd94077f5595be6db /meta/recipes-devtools/meson/meson/gi-target-dep.patch
parentba92cdc55fde5c9e1109bed3461cf6c6bd908f23 (diff)
downloadpoky-f33e81a64395666a3cbb5b9ef299606c3b8052f3.tar.gz
meson: update 0.58.1 -> 0.59.1
Drop 0003-native_bindir.patch: it doesn't seem to actually define anything where the use_native parameter is set to true. Also, the issue should be solved without invasive, custom patching of the code: via meson.cross, custom .pc files for the items in question or some other configuration mechanism. (From OE-Core rev: 191d6d1f614a78ef8496e4357d419c68d1e03170) 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/gi-target-dep.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/gi-target-dep.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-devtools/meson/meson/gi-target-dep.patch b/meta/recipes-devtools/meson/meson/gi-target-dep.patch
deleted file mode 100644
index 29e164ccc7..0000000000
--- a/meta/recipes-devtools/meson/meson/gi-target-dep.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1When building gobject-introspection we want the *native* binaries (as they need
2to be executed) but *host* gobject-introspection libraries, as otherwise the
3native pkg-config can be used and the build will try to link native and host
4binaries together.
5
6Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388]
7Signed-off-by: Ross Burton <ross.burton@arm.com>
8
9diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
10index f9660838e..2eefc3fc7 100644
11--- a/mesonbuild/modules/gnome.py
12+++ b/mesonbuild/modules/gnome.py
13@@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule):
14 mlog.bold('https://github.com/mesonbuild/meson/issues/1387'),
15 once=True)
16
17- def _get_native_dep(self, state, depname, required=True):
18- kwargs = {'native': True, 'required': required}
19+ def _get_dep(self, state, depname, native=False, required=True):
20+ kwargs = {'native': native, 'required': required}
21 holder = self.interpreter.func_dependency(state.current_node, [depname], kwargs)
22 return holder.held_object
23
24@@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule):
25 return ExternalProgram.from_entry(name, prog)
26
27 # Check if pkgconfig has a variable
28- dep = self._get_native_dep(state, depname, required=False)
29+ dep = self._get_dep(state, depname, native=True, required=False)
30 if dep.found() and dep.type_name == 'pkgconfig':
31 value = dep.get_pkgconfig_variable(varname, {})
32 if value:
33@@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule):
34
35 def _get_gir_dep(self, state):
36 if not self.gir_dep:
37- self.gir_dep = self._get_native_dep(state, 'gobject-introspection-1.0')
38+ self.gir_dep = self._get_dep(state, 'gobject-introspection-1.0')
39 self.giscanner = self._get_native_binary(state, 'g-ir-scanner', 'gobject-introspection-1.0', 'g_ir_scanner')
40 self.gicompiler = self._get_native_binary(state, 'g-ir-compiler', 'gobject-introspection-1.0', 'g_ir_compiler')
41 return self.gir_dep, self.giscanner, self.gicompiler