summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-01 23:23:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-02 14:42:08 +0100
commit61228679ec30fcac20237f69a3a117231dea0f73 (patch)
tree0857c2425950597abb52822f5796558100cc59e2 /meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
parent3c3ff0fe40b8ee47457634c7cc26aa2d2e1cea79 (diff)
downloadpoky-61228679ec30fcac20237f69a3a117231dea0f73.tar.gz
meson: update 0.54.3 -> 0.55.0
Rebase patches. (From OE-Core rev: 09dd785ead455fa677c5ccf336d49a32dd7ab6d1) 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/0002-Support-building-allarch-recipes-again.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch4
1 files changed, 2 insertions, 2 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 b5b463e68e..7a3b01262e 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,4 +1,4 @@
1From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001 1From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Thu, 26 Jul 2018 16:32:49 +0200 3Date: Thu, 26 Jul 2018 16:32:49 +0200
4Subject: [PATCH] Support building allarch recipes again 4Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 15diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
16index 18bbf86..e76315e 100644 16index dc20616..f54adcd 100644
17--- a/mesonbuild/envconfig.py 17--- a/mesonbuild/envconfig.py
18+++ b/mesonbuild/envconfig.py 18+++ b/mesonbuild/envconfig.py
19@@ -36,6 +36,7 @@ _T = T.TypeVar('_T') 19@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')