diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-10 19:12:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-11 13:43:41 +0000 |
commit | 4e960cb2b5246af0091304486accb56f9afd12df (patch) | |
tree | 6f35037653e28310ff8884fa88373fd67219e268 /meta/recipes-devtools/meson | |
parent | 1bdf4c02733954d7152645f7c4a85f3baac46fa3 (diff) | |
download | poky-4e960cb2b5246af0091304486accb56f9afd12df.tar.gz |
meson: update 0.63.3 -> 0.64.0
(From OE-Core rev: 835aca65ccb5eda00fbfe51ab203a8df791be83a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_0.64.0.bb (renamed from meta/recipes-devtools/meson/meson_0.63.3.bb) | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch index 83c4782a61..a9a32e2b7a 100644 --- a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch +++ b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 667b9ede638677fb37911306937ea62f05897581 Mon Sep 17 00:00:00 2001 | 1 | From 361f51c2c7685491186703e8f26be991ab698edc Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Mon, 18 Oct 2021 15:55:59 +0200 | 3 | Date: Mon, 18 Oct 2021 15:55:59 +0200 |
4 | Subject: [PATCH] is_debianlike(): always return False | 4 | Subject: [PATCH] is_debianlike(): always return False |
@@ -7,15 +7,16 @@ Otherwise, host contamination happens. | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
10 | |||
10 | --- | 11 | --- |
11 | mesonbuild/mesonlib/universal.py | 2 +- | 12 | mesonbuild/utils/universal.py | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 14 | ||
14 | diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py | 15 | diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py |
15 | index d670d04..47d1b52 100644 | 16 | index 570edd6..4119aa5 100644 |
16 | --- a/mesonbuild/mesonlib/universal.py | 17 | --- a/mesonbuild/utils/universal.py |
17 | +++ b/mesonbuild/mesonlib/universal.py | 18 | +++ b/mesonbuild/utils/universal.py |
18 | @@ -651,7 +651,7 @@ def is_cygwin() -> bool: | 19 | @@ -634,7 +634,7 @@ def is_cygwin() -> bool: |
19 | 20 | ||
20 | 21 | ||
21 | def is_debianlike() -> bool: | 22 | def is_debianlike() -> bool: |
diff --git a/meta/recipes-devtools/meson/meson_0.63.3.bb b/meta/recipes-devtools/meson/meson_0.64.0.bb index 9267077422..84c3c84515 100644 --- a/meta/recipes-devtools/meson/meson_0.63.3.bb +++ b/meta/recipes-devtools/meson/meson_0.64.0.bb | |||
@@ -18,7 +18,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
18 | file://0001-is_debianlike-always-return-False.patch \ | 18 | file://0001-is_debianlike-always-return-False.patch \ |
19 | file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ | 19 | file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ |
20 | " | 20 | " |
21 | SRC_URI[sha256sum] = "519c0932e1a8b208741f0fdce90aa5c0b528dd297cf337009bf63539846ac056" | 21 | SRC_URI[sha256sum] = "c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab" |
22 | 22 | ||
23 | inherit python_setuptools_build_meta github-releases | 23 | inherit python_setuptools_build_meta github-releases |
24 | 24 | ||