summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-01-02 15:20:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-07 12:24:54 +0000
commit51b5e79cd37de982492991e56362cf1f0ef2ab8e (patch)
treef7ea16fa003f960eb2b7c212b062a2a7ed5c564a /meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
parente9ca6bdd43069c0b25115ae70dc09f0dda93ab1f (diff)
downloadopenembedded-core-51b5e79cd37de982492991e56362cf1f0ef2ab8e.tar.gz
meson: upgrade 1.3.0 -> 1.3.1
0001-Make-CPU-family-warnings-fatal.patch 0001-python-module-do-not-manipulate-the-environment-when.patch 0002-Support-building-allarch-recipes-again.patch refreshed for 1.3.1 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index dcc1ce9c27..a8396f30bb 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,21 +1,22 @@
-From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
+From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
-Subject: [PATCH 2/2] Support building allarch recipes again
+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 <peter.kjellerstedt@axis.com>
+
---
mesonbuild/envconfig.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 4d58c91..ff01ad1 100644
+index a35c356..436355f 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
-@@ -36,6 +36,7 @@ from pathlib import Path
+@@ -38,6 +38,7 @@ from pathlib import Path
known_cpu_families = (
@@ -23,6 +24,3 @@ index 4d58c91..ff01ad1 100644
'aarch64',
'alpha',
'arc',
---
-2.24.0
-