diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-06-26 09:18:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-28 08:35:59 +0100 |
commit | 32fd4520360712f7e7b56fefb73ad26e60811788 (patch) | |
tree | 5f12ac7f3b7ab05b6fb040348ace18a340164207 /meta/recipes-devtools | |
parent | 6eb75a5b75225c9359f28bc09fbea7681b360c33 (diff) | |
download | poky-32fd4520360712f7e7b56fefb73ad26e60811788.tar.gz |
meson: upgrade 0.54.2 -> 0.54.3
(From OE-Core rev: db90ff4005cdf837617a7c5c58ae03d7570b062e)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/meson/meson.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch | 35 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_0.54.3.bb (renamed from meta/recipes-devtools/meson/meson_0.54.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.54.2.bb) | 0 |
6 files changed, 3 insertions, 39 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index a0b54f57db..ffa17b3061 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc | |||
@@ -15,9 +15,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P | |||
15 | file://cross-prop-default.patch \ | 15 | file://cross-prop-default.patch \ |
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 | file://0001-boost-Always-sort-shared-before-static-fixes-7171.patch \ | ||
19 | " | 18 | " |
20 | SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455" | 19 | SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662" |
21 | 20 | ||
22 | SRC_URI_append_class-native = " \ | 21 | SRC_URI_append_class-native = " \ |
23 | 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 8b2263588c..1be94a9b19 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 @@ | |||
1 | From 830db2c7a136b2446d740c9ca025374352ffd16d Mon Sep 17 00:00:00 2001 | 1 | From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
4 | Subject: [PATCH] Make CPU family warnings fatal | 4 | Subject: [PATCH] Make CPU family warnings fatal |
diff --git a/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch b/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch deleted file mode 100644 index 217218180e..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Mensinger <daniel@mensinger-ka.de> | ||
3 | Date: Thu, 21 May 2020 13:35:27 +0200 | ||
4 | Subject: [PATCH] boost: Always sort shared before static (fixes #7171) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/5862ad6965c60caa861dfdcd29e499c34c4d00da] | ||
7 | |||
8 | Signed-off-by: Andrew Geissler <geissonator@gmail.com> | ||
9 | --- | ||
10 | mesonbuild/dependencies/boost.py | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py | ||
14 | index 6e85c534..38497041 100644 | ||
15 | --- a/mesonbuild/dependencies/boost.py | ||
16 | +++ b/mesonbuild/dependencies/boost.py | ||
17 | @@ -189,13 +189,13 @@ class BoostLibraryFile(): | ||
18 | def __lt__(self, other: T.Any) -> bool: | ||
19 | if isinstance(other, BoostLibraryFile): | ||
20 | return ( | ||
21 | - self.mod_name, self.version_lib, self.arch, self.static, | ||
22 | + self.mod_name, self.static, self.version_lib, self.arch, | ||
23 | not self.mt, not self.runtime_static, | ||
24 | not self.debug, self.runtime_debug, self.python_debug, | ||
25 | self.stlport, self.deprecated_iostreams, | ||
26 | self.name, | ||
27 | ) < ( | ||
28 | - other.mod_name, other.version_lib, other.arch, other.static, | ||
29 | + other.mod_name, other.static, other.version_lib, other.arch, | ||
30 | not other.mt, not other.runtime_static, | ||
31 | not other.debug, other.runtime_debug, other.python_debug, | ||
32 | other.stlport, other.deprecated_iostreams, | ||
33 | -- | ||
34 | 2.26.2 | ||
35 | |||
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 18517a6e26..b5b463e68e 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 @@ | |||
1 | From 45df8f0a71c6b60cb98a336f8690af04965dfa9b Mon Sep 17 00:00:00 2001 | 1 | From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <pkj@axis.com> | 2 | From: Peter Kjellerstedt <pkj@axis.com> |
3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 | 3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 |
4 | Subject: [PATCH] Support building allarch recipes again | 4 | Subject: [PATCH] Support building allarch recipes again |
diff --git a/meta/recipes-devtools/meson/meson_0.54.2.bb b/meta/recipes-devtools/meson/meson_0.54.3.bb index de9b905c12..de9b905c12 100644 --- a/meta/recipes-devtools/meson/meson_0.54.2.bb +++ b/meta/recipes-devtools/meson/meson_0.54.3.bb | |||
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.54.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb index 67add2c25e..67add2c25e 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.54.2.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb | |||