summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-18 17:59:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-23 23:30:10 +0100
commitad1d0187aed457e4b5bd1c0d11b39141786bc9fd (patch)
tree7648fb7178b35e4ddd17b5edd27c23a677e22634 /meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
parent60502aa366f860b4f056da1bcd8fd5ee8f4495f5 (diff)
downloadopenembedded-core-contrib-ad1d0187aed457e4b5bd1c0d11b39141786bc9fd.tar.gz
meson: do not try to substitute the prefix in python supplied paths
The prefix should be correct in the first place, and substitution breaks with our custom patched Python. 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.patch6
1 files changed, 3 insertions, 3 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 2580b1e366..9e90b72f31 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 @@
-From f76d2bf09f7ffd871d068c4ac4c4be083f5fb07f Mon Sep 17 00:00:00 2001
+From 1ec44c955f45f3787aaf92edd70dec5bcf03f665 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index f2510c1..b9841fe 100644
+index 5309ef4..3f0a399 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -178,7 +178,7 @@ class MachineInfo:
@@ -25,7 +25,7 @@ index f2510c1..b9841fe 100644
endian = literal['endian']
if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 4c1c5ac..a5a7461 100644
+index 3031a82..ecd18d0 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -242,9 +242,7 @@ def detect_cpu_family(compilers):