mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 15:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
6eb75a5b75
commit
32fd452036
@@ -15,9 +15,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
|
||||
file://cross-prop-default.patch \
|
||||
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
|
||||
file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
|
||||
file://0001-boost-Always-sort-shared-before-static-fixes-7171.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455"
|
||||
SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662"
|
||||
|
||||
SRC_URI_append_class-native = " \
|
||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 830db2c7a136b2446d740c9ca025374352ffd16d Mon Sep 17 00:00:00 2001
|
||||
From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 3 Jul 2018 13:59:09 +0100
|
||||
Subject: [PATCH] Make CPU family warnings fatal
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Mensinger <daniel@mensinger-ka.de>
|
||||
Date: Thu, 21 May 2020 13:35:27 +0200
|
||||
Subject: [PATCH] boost: Always sort shared before static (fixes #7171)
|
||||
|
||||
Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/5862ad6965c60caa861dfdcd29e499c34c4d00da]
|
||||
|
||||
Signed-off-by: Andrew Geissler <geissonator@gmail.com>
|
||||
---
|
||||
mesonbuild/dependencies/boost.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
|
||||
index 6e85c534..38497041 100644
|
||||
--- a/mesonbuild/dependencies/boost.py
|
||||
+++ b/mesonbuild/dependencies/boost.py
|
||||
@@ -189,13 +189,13 @@ class BoostLibraryFile():
|
||||
def __lt__(self, other: T.Any) -> bool:
|
||||
if isinstance(other, BoostLibraryFile):
|
||||
return (
|
||||
- self.mod_name, self.version_lib, self.arch, self.static,
|
||||
+ self.mod_name, self.static, self.version_lib, self.arch,
|
||||
not self.mt, not self.runtime_static,
|
||||
not self.debug, self.runtime_debug, self.python_debug,
|
||||
self.stlport, self.deprecated_iostreams,
|
||||
self.name,
|
||||
) < (
|
||||
- other.mod_name, other.version_lib, other.arch, other.static,
|
||||
+ other.mod_name, other.static, other.version_lib, other.arch,
|
||||
not other.mt, not other.runtime_static,
|
||||
not other.debug, other.runtime_debug, other.python_debug,
|
||||
other.stlport, other.deprecated_iostreams,
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 45df8f0a71c6b60cb98a336f8690af04965dfa9b Mon Sep 17 00:00:00 2001
|
||||
From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001
|
||||
From: Peter Kjellerstedt <pkj@axis.com>
|
||||
Date: Thu, 26 Jul 2018 16:32:49 +0200
|
||||
Subject: [PATCH] Support building allarch recipes again
|
||||
|
||||
Reference in New Issue
Block a user