From: Peter Kjellerstedt Date: Tue, 14 Aug 2018 19:06:24 +0000 (+0200) Subject: meson: Support building allarch recipes again X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17031 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f12b64e9332e3988953f87d8cea39ca309be5046;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git meson: Support building allarch recipes again This registers "allarch" as a known CPU family. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c9e1e051c64..b5dfa2c2a2b 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -15,6 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0002-Make-CPU-family-warnings-fatal.patch \ file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \ file://0001-mesonbuild-Recognise-risc-v-architecture.patch \ + file://0001-Support-building-allarch-recipes-again.patch \ " SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582" diff --git a/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch new file mode 100644 index 00000000000..f6dd2309168 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch @@ -0,0 +1,28 @@ +From d80d02a3ca6e21fa3d055c88c05234c2eb4db128 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Thu, 26 Jul 2018 16:32:49 +0200 +Subject: [PATCH] Support building allarch recipes again + +This registers "allarch" as a known CPU family. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Peter Kjellerstedt +--- + mesonbuild/environment.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index a0580a2..712b1e8 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -73,6 +73,7 @@ from .compilers import ( + build_filename = 'meson.build' + + known_cpu_families = ( ++ 'allarch', + 'aarch64', + 'arm', + 'e2k', +-- +2.12.0 +