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/05 04:05:20 UTC
[buildstream-plugins] 01/01: meson, cmake: Ensure verbosity
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/fix-missing-verbosity
in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
commit 8832f54d38a98119d58dc8b1e6a17e5e364b5444
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Mon Dec 5 13:01:48 2022 +0900
meson, cmake: Ensure verbosity
o cmake: The `V=1` environment variable only works when running make,
and the `VERBOSE=1` environment also only works with make, in order
to ensure commands are printed in the logs with either make or ninja
we need to set -DCMAKE_VERBOSE_MAKEFILE=ON.
o meson: In order ensure we get verbosity with ninja we need to
pass it the `-v` command line option.
---
src/buildstream_plugins/elements/cmake.yaml | 5 ++---
src/buildstream_plugins/elements/meson.yaml | 2 +-
tests/cachekey/project/elements/cmake1.expected | 2 +-
tests/cachekey/project/elements/meson1.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/buildstream_plugins/elements/cmake.yaml b/src/buildstream_plugins/elements/cmake.yaml
index 8dfab1d..aaf5c33 100644
--- a/src/buildstream_plugins/elements/cmake.yaml
+++ b/src/buildstream_plugins/elements/cmake.yaml
@@ -27,6 +27,7 @@ variables:
cmake-args: |
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \
-DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-global} %{cmake-local}
@@ -72,10 +73,8 @@ config:
# Use max-jobs CPUs for building and enable verbosity
environment:
JOBS: -j%{max-jobs}
- V: 1
-# And dont consider JOBS or V as something which may
+# And dont consider JOBS as something which may
# affect build output.
environment-nocache:
- JOBS
-- V
diff --git a/src/buildstream_plugins/elements/meson.yaml b/src/buildstream_plugins/elements/meson.yaml
index 2db56b8..3ec2ece 100644
--- a/src/buildstream_plugins/elements/meson.yaml
+++ b/src/buildstream_plugins/elements/meson.yaml
@@ -40,7 +40,7 @@ variables:
meson: meson setup %{conf-root} %{build-dir} %{meson-args}
meson-build: |
- ninja -j ${JOBS} -C %{build-dir}
+ ninja -v -j ${JOBS} -C %{build-dir}
meson-install: |
env DESTDIR="%{install-root}" meson install -C %{build-dir} --no-rebuild
diff --git a/tests/cachekey/project/elements/cmake1.expected b/tests/cachekey/project/elements/cmake1.expected
index 1401206..75e8874 100644
--- a/tests/cachekey/project/elements/cmake1.expected
+++ b/tests/cachekey/project/elements/cmake1.expected
@@ -1 +1 @@
-8f1eecc3592e71c82de005be84701025ae0f104a33f5f49f5b117743e79e4281
\ No newline at end of file
+d76a32a55035f8ca8a31634490400657f73efe6ec5d8fbc28393c98f482262de
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/meson1.expected b/tests/cachekey/project/elements/meson1.expected
index c2f6bbe..75f1aa6 100644
--- a/tests/cachekey/project/elements/meson1.expected
+++ b/tests/cachekey/project/elements/meson1.expected
@@ -1 +1 @@
-45b6ba4192ce48788b202a02255075f0c479cf42dc7ae8316df65709f72a1a97
\ No newline at end of file
+e971e99926950e605d88f3d65edd1bad584a2b2a23943460aa48250be889622f
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index ff90caa..d2a179a 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-1be743d355c5c35502565185d9922213f0667b355abf5e6a3f88594d0fd64f96
\ No newline at end of file
+3dc2ed8ab56f9c706e1fbf4bacc1ab1e38d20f66c686f1ab05d5ad0e504272fc
\ No newline at end of file