summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
diff options
context:
space:
mode:
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.patch10
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 8fbcb5a0a2..8ea7c35950 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 @@
1From fcd3260c03f313676720e6219c5953d412fb0a2c Mon Sep 17 00:00:00 2001 1From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
12 2 files changed, 4 insertions(+), 6 deletions(-) 12 2 files changed, 4 insertions(+), 6 deletions(-)
13 13
14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
15index 7e0c567..a180065 100644 15index 07f1229..a35c356 100644
16--- a/mesonbuild/envconfig.py 16--- a/mesonbuild/envconfig.py
17+++ b/mesonbuild/envconfig.py 17+++ b/mesonbuild/envconfig.py
18@@ -284,8 +284,8 @@ class MachineInfo(HoldableObject): 18@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject):
19 'but is missing {}.'.format(minimum_literal - set(literal))) 19 'but is missing {}.'.format(minimum_literal - set(literal)))
20 20
21 cpu_family = literal['cpu_family'] 21 cpu_family = literal['cpu_family']
@@ -27,10 +27,10 @@ index 7e0c567..a180065 100644
27 endian = literal['endian'] 27 endian = literal['endian']
28 if endian not in ('little', 'big'): 28 if endian not in ('little', 'big'):
29diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 29diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
30index e212c7a..9d2bff3 100644 30index 2ba2054..d798e3b 100644
31--- a/mesonbuild/environment.py 31--- a/mesonbuild/environment.py
32+++ b/mesonbuild/environment.py 32+++ b/mesonbuild/environment.py
33@@ -345,10 +345,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 33@@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
34 if compilers and not any_compiler_has_define(compilers, '__mips64'): 34 if compilers and not any_compiler_has_define(compilers, '__mips64'):
35 trial = 'mips' 35 trial = 'mips'
36 36