summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/meson/meson.inc2
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch12
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch32
-rw-r--r--meta/recipes-devtools/meson/meson_0.56.0.bb (renamed from meta/recipes-devtools/meson/meson_0.55.1.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb)0
5 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 004189e36e..2d3adbdb1a 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ 17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
18 " 18 "
19SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080" 19SRC_URI[sha256sum] = "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213"
20 20
21SRC_URI_append_class-native = " \ 21SRC_URI_append_class-native = " \
22 file://0001-Make-CPU-family-warnings-fatal.patch \ 22 file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index fbc03b8ca0..86edcb5241 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
1From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001 1From 110a525e5ebed2fca138d72da493c39510311c1f Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
12 2 files changed, 2 insertions(+), 4 deletions(-) 12 2 files changed, 2 insertions(+), 4 deletions(-)
13 13
14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
15index 219b62e..d1be65b 100644 15index 13d0ba5..5ba3a1a 100644
16--- a/mesonbuild/envconfig.py 16--- a/mesonbuild/envconfig.py
17+++ b/mesonbuild/envconfig.py 17+++ b/mesonbuild/envconfig.py
18@@ -199,7 +199,7 @@ class MachineInfo: 18@@ -254,7 +254,7 @@ class MachineInfo:
19 19
20 cpu_family = literal['cpu_family'] 20 cpu_family = literal['cpu_family']
21 if cpu_family not in known_cpu_families: 21 if cpu_family not in known_cpu_families:
@@ -25,11 +25,11 @@ index 219b62e..d1be65b 100644
25 endian = literal['endian'] 25 endian = literal['endian']
26 if endian not in ('little', 'big'): 26 if endian not in ('little', 'big'):
27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
28index bf09a88..8eabe78 100644 28index 588005b..988e3ea 100644
29--- a/mesonbuild/environment.py 29--- a/mesonbuild/environment.py
30+++ b/mesonbuild/environment.py 30+++ b/mesonbuild/environment.py
31@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 31@@ -400,9 +400,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
32 trial = 'parisc' 32 trial = 'ppc64'
33 33
34 if trial not in known_cpu_families: 34 if trial not in known_cpu_families:
35- mlog.warning('Unknown CPU family {!r}, please report this at ' 35- mlog.warning('Unknown CPU family {!r}, please report this at '
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 5d7bdc2f59..fb55a05187 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 f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001 1From cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed 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
@@ -15,22 +15,21 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment
15 15
16Upstream-Status: Inappropriate [OE specific] 16Upstream-Status: Inappropriate [OE specific]
17Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 17Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
18
19--- 18---
20 mesonbuild/dependencies/base.py | 19 +++++++++++-------- 19 mesonbuild/dependencies/base.py | 19 +++++++++++--------
21 mesonbuild/dependencies/ui.py | 6 +++--- 20 mesonbuild/dependencies/ui.py | 6 +++---
22 2 files changed, 14 insertions(+), 11 deletions(-) 21 2 files changed, 14 insertions(+), 11 deletions(-)
23 22
24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py 23diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
25index 368a4bc..9fc398e 100644 24index 3a5f5f8..0af89f8 100644
26--- a/mesonbuild/dependencies/base.py 25--- a/mesonbuild/dependencies/base.py
27+++ b/mesonbuild/dependencies/base.py 26+++ b/mesonbuild/dependencies/base.py
28@@ -183,7 +183,7 @@ class Dependency: 27@@ -183,7 +183,7 @@ class Dependency:
29 def get_exe_args(self, compiler): 28 def get_exe_args(self, compiler):
30 return [] 29 return []
31 30
32- def get_pkgconfig_variable(self, variable_name, kwargs): 31- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str:
33+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): 32+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str:
34 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) 33 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
35 34
36 def get_configtool_variable(self, variable_name): 35 def get_configtool_variable(self, variable_name):
@@ -38,12 +37,12 @@ index 368a4bc..9fc398e 100644
38 setattr(result, k, copy.deepcopy(v, memo)) 37 setattr(result, k, copy.deepcopy(v, memo))
39 return result 38 return result
40 39
41- def get_pkgconfig_variable(self, variable_name, kwargs): 40- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str:
42+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): 41+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str:
43 raise DependencyException('Method "get_pkgconfig_variable()" is ' 42 raise DependencyException('Method "get_pkgconfig_variable()" is '
44 'invalid for an internal dependency') 43 'invalid for an internal dependency')
45 44
46@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency): 45@@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency):
47 return s.format(self.__class__.__name__, self.name, self.is_found, 46 return s.format(self.__class__.__name__, self.name, self.is_found,
48 self.version_reqs) 47 self.version_reqs)
49 48
@@ -57,15 +56,16 @@ index 368a4bc..9fc398e 100644
57 p, out, err = Popen_safe(cmd, env=env) 56 p, out, err = Popen_safe(cmd, env=env)
58 rc, out, err = p.returncode, out.strip(), err.strip() 57 rc, out, err = p.returncode, out.strip(), err.strip()
59 call = ' '.join(cmd) 58 call = ' '.join(cmd)
60 mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) 59@@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency):
61 return rc, out, err 60 mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
61
62 62
63- def _call_pkgbin(self, args, env=None): 63- def _call_pkgbin(self, args, env=None):
64+ def _call_pkgbin(self, args, env=None, use_native=False): 64+ def _call_pkgbin(self, args, env=None, use_native=False):
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@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency): 68@@ -680,7 +683,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:
@@ -74,16 +74,16 @@ index 368a4bc..9fc398e 100644
74 return cache[(self.pkgbin, targs, fenv)] 74 return cache[(self.pkgbin, targs, fenv)]
75 75
76 def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: 76 def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
77@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency): 77@@ -889,7 +892,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
81- def get_pkgconfig_variable(self, variable_name, kwargs): 81- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str:
82+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): 82+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str:
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@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency): 86@@ -902,7 +905,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 368a4bc..9fc398e 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 95dfe2b..5f82890 100644 96index 5dffd3a..fb3a178 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@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): 99@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
diff --git a/meta/recipes-devtools/meson/meson_0.55.1.bb b/meta/recipes-devtools/meson/meson_0.56.0.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.55.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.56.0.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb
index 67add2c25e..67add2c25e 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb