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