summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-19 20:47:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-21 09:39:00 +0000
commit97a6f7ad7c8ac468873e0f88c66dd04461399354 (patch)
tree0d4739edcda944f3a02a4c99506149d1d6c27064
parent084f767a3d0a5440634a823aad906b91997722fb (diff)
downloadpoky-97a6f7ad7c8ac468873e0f88c66dd04461399354.tar.gz
meson: upgrade 0.53.0 -> 0.53.1
(From OE-Core rev: c94ae81f9ebf9d4d3546a86e097cdba51b3468b0) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson.inc4
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch2
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch2
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch12
-rw-r--r--meta/recipes-devtools/meson/meson_0.53.1.bb (renamed from meta/recipes-devtools/meson/meson_0.53.0.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb)0
6 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index c0ce7d338b..d391c9cf29 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
17 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ 17 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
18 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 18 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
19 " 19 "
20SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" 20SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04"
21SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" 21SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2"
22 22
23SRC_URI_append_class-native = " \ 23SRC_URI_append_class-native = " \
24 file://0001-Make-CPU-family-warnings-fatal.patch \ 24 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 74d5b4ca66..9ce31e5489 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 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 1From ee638fd4a299bfc53a2238e9f71ae310c8d97460 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
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index 1529ebe9fe..ce18660756 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
1From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 1From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Thu, 26 Jul 2018 16:32:49 +0200 3Date: Thu, 26 Jul 2018 16:32:49 +0200
4Subject: [PATCH] Support building allarch recipes again 4Subject: [PATCH] Support building allarch recipes again
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 76c1aa9ac1..dc822fb1fc 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 af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 1From e76726321067748362b39937bd1e663a1a948ad5 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 f17b9f2..b5c9c92 100644 25index 40e304c..4b687df 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:
@@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 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: List[str]) -> List[str]: 76 def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
77@@ -907,7 +910,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)
@@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 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 bdcc4a7..e2de847 100644 96index da411ef..856506a 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):
@@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644
105 if prefix: 105 if prefix:
106 self.bindir = os.path.join(prefix, 'bin') 106 self.bindir = os.path.join(prefix, 'bin')
107 107
108@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): 108@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency):
109 applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] 109 applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
110 for application in applications: 110 for application in applications:
111 try: 111 try:
@@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644
114 except MesonException: 114 except MesonException:
115 pass 115 pass
116 116
117@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): 117@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency):
118 QtBaseDependency.__init__(self, 'qt5', env, kwargs) 118 QtBaseDependency.__init__(self, 'qt5', env, kwargs)
119 119
120 def get_pkgconfig_host_bins(self, core): 120 def get_pkgconfig_host_bins(self, core):
diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.53.0.bb
+++ b/meta/recipes-devtools/meson/meson_0.53.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb
index 67add2c25e..67add2c25e 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb