You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by tv...@apache.org on 2022/12/03 05:20:02 UTC
[buildstream-plugins] branch master updated: Fix deprecation warning for Meson
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
The following commit(s) were added to refs/heads/master by this push:
new 926efa1 Fix deprecation warning for Meson
new 7c23e15 Merge pull request #38 from nanonyme/meson
926efa1 is described below
commit 926efa1ab1ce0098e542c81ba50e5d732b887dfb
Author: Seppo Yli-Olli <se...@gmail.com>
AuthorDate: Mon Nov 28 22:49:24 2022 +0200
Fix deprecation warning for Meson
See https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0
---
src/buildstream_plugins/elements/meson.yaml | 2 +-
tests/cachekey/project/elements/meson1.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/buildstream_plugins/elements/meson.yaml b/src/buildstream_plugins/elements/meson.yaml
index 82020d3..8f08e0b 100644
--- a/src/buildstream_plugins/elements/meson.yaml
+++ b/src/buildstream_plugins/elements/meson.yaml
@@ -40,7 +40,7 @@ variables:
--mandir=%{mandir} \
--infodir=%{infodir} %{meson-extra} %{meson-global} %{meson-local}
- meson: meson %{conf-root} %{build-dir} %{meson-args}
+ meson: meson setup %{conf-root} %{build-dir} %{meson-args}
ninja: |
ninja -j ${NINJAJOBS} -C %{build-dir}
diff --git a/tests/cachekey/project/elements/meson1.expected b/tests/cachekey/project/elements/meson1.expected
index d966047..a43c69a 100644
--- a/tests/cachekey/project/elements/meson1.expected
+++ b/tests/cachekey/project/elements/meson1.expected
@@ -1 +1 @@
-3ebf1011dac6034b710ec85e80da993624c2c33014915cada59d130ced11f47e
\ No newline at end of file
+eb27d2832662f0b5d9fcb4e6304611e85226b282cc8f83ac79bdc56031307758
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 1fcf4ef..6b18d77 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-33d7f831583b2f8ebff9ad0c99520e38ce5d822f1d2e50fbb93e177ebbbd55e8
\ No newline at end of file
+7881a8251b8128165d28720f1e5b30e4e914e2711700e4d7231c7ab91f10ba39
\ No newline at end of file