diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch')
| -rw-r--r-- | meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch b/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch index 8f4603e767..5295335730 100644 --- a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch +++ b/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch @@ -1,7 +1,7 @@ -From 62f4702a1d5076d0c225f899fe65cd3badfdd022 Mon Sep 17 00:00:00 2001 +From 31df0a854aa40c4ce8fbf1ca02ccc9b6bff0abfd Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 6 Jul 2018 15:51:15 +0100 -Subject: [PATCH 3/3] Send user to our wiki instead of Meson bug system +Subject: [PATCH] Send user to our wiki instead of Meson bug system If a CPU family isn't recognised the first step should be to verify the mapping. Send the user to a wiki page explaining what to do, instead of @@ -9,16 +9,17 @@ directly to the Meson bug tracker. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <ross.burton@intel.com> + --- mesonbuild/environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 8b32892..a0580a2 100644 +index 267acf9..19a3c1e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -228,7 +228,7 @@ def detect_cpu_family(compilers): - # Add fixes here as bugs are reported. +@@ -239,7 +239,7 @@ def detect_cpu_family(compilers): + return 'x86_64' if trial not in known_cpu_families: - raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) @@ -26,7 +27,7 @@ index 8b32892..a0580a2 100644 return trial -@@ -1043,7 +1043,7 @@ class CrossBuildInfo: +@@ -1012,7 +1012,7 @@ class CrossBuildInfo: raise EnvironmentException('Malformed value in cross file variable %s.' % entry) if entry == 'cpu_family' and res not in known_cpu_families: @@ -35,6 +36,3 @@ index 8b32892..a0580a2 100644 if self.ok_type(res): self.config[s][entry] = res --- -2.12.0 - |