Re: [libvirt PATCH v3] ci: Switch to meson build system
On Mon, 2020-11-23 at 18:37 +0100, Erik Skultety wrote:
+++ b/ci/Makefile
@@ -221,12 +203,15 @@ ci-run-command@%: ci-prepare-tree
--user="#$(CI_UID)" \
--group="#$(CI_GID)" \
CONFIGURE_OPTS="$$CONFIGURE_OPTS" \
+ MESON_OPTS="$$MESON_OPTS" \
CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
CI_CONT_BUILDDIR="$(CI_CONT_BUILDDIR)" \
CI_SMP="$(CI_SMP)" \
CI_CONFIGURE="$(CI_CONFIGURE)" \
CI_CONFIGURE_ARGS="$(CI_CONFIGURE_ARGS)" \
CI_MAKE_ARGS="$(CI_MAKE_ARGS)" \
Please drop CONFIGURE_OPTS, CI_CONT_BUILDDIR, CI_SMP, CI_CONFIGURE,
CI_CONFIGURE_ARGS and CI_MAKE_ARGS.
+ CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
+ CI_NINJA_ARGS="$(CI_NINJA_ARGS)" \
CI_CONT_SRCDIR is already present in the list, no need to pass it
twice.
+++ b/ci/build.sh
@@ -7,32 +7,9 @@
-# $CONFIGURE_OPTS is a env that can optionally be set in the container,
-# populated at build time from the Dockerfile. A typical use case would
-# be to pass --host/--target args to trigger cross-compilation
-#
-# This can be augmented by make local args in $CI_CONFIGURE_ARGS
-"$CI_CONFIGURE" $CONFIGURE_OPTS $CI_CONFIGURE_ARGS
While CONFIGURE_OPTS and CI_CONFIGURE_ARGS no longer exist, the
description of the former still applies to MESON_OPTS, so we should
adapt it rather than rip it out. And it probably makes sense to
introduce CI_MESON_ARGS to replace CI_CONFIGURE_ARGS too, so that you
could use it to pass things like -Dsome_feature=disable or similar.
--
Andrea Bolognani / Red Hat / Virtualization