mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
meson: upgrade 1.7.1 -> 1.7.2
0001-Make-CPU-family-warnings-fatal.patch refreshed for 1.7.2 (From OE-Core rev: b8c15494900cdacfdcfa18526b8ad33cb9ce5ee3) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9f238203e5
commit
9bde1176c1
|
@ -1,4 +1,4 @@
|
|||
From 32c4ccfbdc8649f595a79e7fd1bd39d6f8325340 Mon Sep 17 00:00:00 2001
|
||||
From 8ba2c1f596206d45e8f14d4f4d2439023a3de9e7 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
|
||||
|
@ -11,10 +11,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|||
2 files changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
|
||||
index 86bad9b..9703315 100644
|
||||
index 6726d4e..844b611 100644
|
||||
--- a/mesonbuild/envconfig.py
|
||||
+++ b/mesonbuild/envconfig.py
|
||||
@@ -277,8 +277,8 @@ class MachineInfo(HoldableObject):
|
||||
@@ -278,8 +278,8 @@ class MachineInfo(HoldableObject):
|
||||
'but is missing {}.'.format(minimum_literal - set(literal)))
|
||||
|
||||
cpu_family = literal['cpu_family']
|
||||
|
@ -26,10 +26,10 @@ index 86bad9b..9703315 100644
|
|||
endian = literal['endian']
|
||||
if endian not in ('little', 'big'):
|
||||
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
|
||||
index 71a2f3a..4cbeabe 100644
|
||||
index 386316e..b4a0d88 100644
|
||||
--- a/mesonbuild/environment.py
|
||||
+++ b/mesonbuild/environment.py
|
||||
@@ -416,10 +416,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
|
||||
@@ -419,10 +419,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
|
||||
if compilers and not any_compiler_has_define(compilers, '__mips64'):
|
||||
trial = 'mips'
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
|
|||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
file://0002-Support-building-allarch-recipes-again.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "155780a5be87f6dd7f427ad8bcbf0f2b2c5f62ee5fdacca7caa9de8439a24b89"
|
||||
SRC_URI[sha256sum] = "4d40d63aa748a9c139cc41ab9bffe43edd113c5639d78bde81544ca955aea890"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
|
||||
|
||||
inherit python_setuptools_build_meta github-releases
|
Loading…
Reference in New Issue
Block a user