diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-04 21:07:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 12:20:32 +0000 |
commit | 9b4e6b2bc49280ca8a9777d9e383014227af55ee (patch) | |
tree | 9182262da40c12919160f91f02d0ae8e667c382f /meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | |
parent | ba069a5a3dae374744f68a57ab9e7869167beb2b (diff) | |
download | poky-9b4e6b2bc49280ca8a9777d9e383014227af55ee.tar.gz |
meson: upgrade 0.55.1 -> 0.56.0
(From OE-Core rev: 348372c2fefe57ca385be301dd372dcd473efd83)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ | |||
1 | From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001 | 1 | From 110a525e5ebed2fca138d72da493c39510311c1f 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 |
@@ -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 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index 219b62e..d1be65b 100644 | 15 | index 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'): |
27 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 27 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
28 | index bf09a88..8eabe78 100644 | 28 | index 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 ' |