diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-04 13:27:31 +0100 |
commit | 7b2ae9881f189781d30460dcca4432181fd4bce8 (patch) | |
tree | e65cd91f3cb93ec2366e6a30594c71675767cad2 /meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | |
parent | 3ec2330acf6cf84f9030cd3358813170fb3ceff0 (diff) | |
download | poky-7b2ae9881f189781d30460dcca4432181fd4bce8.tar.gz |
meson: upgrade 0.53.2 -> 0.54.2
Drop 0001-mesonbuild-environment.py-check-environment-for-vari.patch
as upstream has refactored the code.
(From OE-Core rev: 1264edce86cafaa64428bb42844437ac4de7df3a)
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 | 10 |
1 files changed, 5 insertions, 5 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 9ce31e5489..8b2263588c 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 ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 | 1 | From 830db2c7a136b2446d740c9ca025374352ffd16d 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 0f277a7..24578ea 100644 | 15 | index 17058df..18bbf86 100644 |
16 | --- a/mesonbuild/envconfig.py | 16 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 17 | +++ b/mesonbuild/envconfig.py |
18 | @@ -192,7 +192,7 @@ class MachineInfo: | 18 | @@ -225,7 +225,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,10 +25,10 @@ index 0f277a7..24578ea 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 dc8b14f..3aab71e 100644 | 28 | index a2f78a4..59fcb07 100644 |
29 | --- a/mesonbuild/environment.py | 29 | --- a/mesonbuild/environment.py |
30 | +++ b/mesonbuild/environment.py | 30 | +++ b/mesonbuild/environment.py |
31 | @@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 31 | @@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
32 | trial = 'parisc' | 32 | trial = 'parisc' |
33 | 33 | ||
34 | if trial not in known_cpu_families: | 34 | if trial not in known_cpu_families: |