summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-24 11:17:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 16:48:09 +0000
commit4821e629efe0ec86cef32d326c2fc5ab6515d2f6 (patch)
tree455761d449c96cd312e417fbfbeac06be77ea28d /meta/recipes-devtools/meson/meson/0003-native_bindir.patch
parent22dd46cc34629d0750177fddff2e1c178c854340 (diff)
downloadpoky-4821e629efe0ec86cef32d326c2fc5ab6515d2f6.tar.gz
meson: update 0.52.1 -> 0.53.0
Unset LD, and do not set ld in cross file from LD as new version of meson passes that value directly to -fuse-ld=... which requires one of lld, bfd, gold. (From OE-Core rev: e0e30637a139feb744ca284aa63d47efefc5cb5d) 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/0003-native_bindir.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 14a9a13666..76c1aa9ac1 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
1From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001 1From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
3Date: Wed, 15 Nov 2017 15:05:01 +0100 3Date: Wed, 15 Nov 2017 15:05:01 +0100
4Subject: [PATCH] native_bindir 4Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
22 2 files changed, 14 insertions(+), 11 deletions(-) 22 2 files changed, 14 insertions(+), 11 deletions(-)
23 23
24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py 24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
25index 35f0175..b39cba6 100644 25index f17b9f2..b5c9c92 100644
26--- a/mesonbuild/dependencies/base.py 26--- a/mesonbuild/dependencies/base.py
27+++ b/mesonbuild/dependencies/base.py 27+++ b/mesonbuild/dependencies/base.py
28@@ -184,7 +184,7 @@ class Dependency: 28@@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
43 raise DependencyException('Method "get_pkgconfig_variable()" is ' 43 raise DependencyException('Method "get_pkgconfig_variable()" is '
44 'invalid for an internal dependency') 44 'invalid for an internal dependency')
45 45
46@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency): 46@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
47 return s.format(self.__class__.__name__, self.name, self.is_found, 47 return s.format(self.__class__.__name__, self.name, self.is_found,
48 self.version_reqs) 48 self.version_reqs)
49 49
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
65 # Always copy the environment since we're going to modify it 65 # Always copy the environment since we're going to modify it
66 # with pkg-config variables 66 # with pkg-config variables
67 if env is None: 67 if env is None:
68@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency): 68@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
69 targs = tuple(args) 69 targs = tuple(args)
70 cache = PkgConfigDependency.pkgbin_cache 70 cache = PkgConfigDependency.pkgbin_cache
71 if (self.pkgbin, targs, fenv) not in cache: 71 if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
73+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) 73+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
74 return cache[(self.pkgbin, targs, fenv)] 74 return cache[(self.pkgbin, targs, fenv)]
75 75
76 def _convert_mingw_paths(self, args): 76 def _convert_mingw_paths(self, args: List[str]) -> List[str]:
77@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency): 77@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
78 (self.name, out_raw)) 78 (self.name, out_raw))
79 self.link_args, self.raw_link_args = self._search_libs(out, out_raw) 79 self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
80 80
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
83 options = ['--variable=' + variable_name, self.name] 83 options = ['--variable=' + variable_name, self.name]
84 84
85 if 'define_variable' in kwargs: 85 if 'define_variable' in kwargs:
86@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency): 86@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
87 87
88 options = ['--define-variable=' + '='.join(definition)] + options 88 options = ['--define-variable=' + '='.join(definition)] + options
89 89
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
93 if ret != 0: 93 if ret != 0:
94 if self.required: 94 if self.required:
95diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py 95diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
96index 6d784e6..73a9e13 100644 96index bdcc4a7..e2de847 100644
97--- a/mesonbuild/dependencies/ui.py 97--- a/mesonbuild/dependencies/ui.py
98+++ b/mesonbuild/dependencies/ui.py 98+++ b/mesonbuild/dependencies/ui.py
99@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): 99@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):