mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 03:21:19 +00:00
b68d253c46
Commit 9c9848f955 merged $MESON_OPTS into $MESON_ARGS, and
while doing so changed their behavior: while until then the
contents of $MESON_ARGS had precedence over those of $MESON_OPTS,
now the opposite is true. Restore the original behavior and
document it.
The argument for merging the two variables in the first place
was that having both present on the meson command line could be
confusing; however, that should no longer be the case now that
we have reasonably extensive comments explaining the role of
each of the variables and how they interact with each other, so
return the meson command line to its original form.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
24 lines
833 B
Bash
24 lines
833 B
Bash
#!/bin/sh
|
|
|
|
cd "$CI_CONT_SRCDIR"
|
|
|
|
export VIR_TEST_DEBUG=1
|
|
|
|
# $MESON_OPTS is an env that can optionally be set in the container,
|
|
# populated at build time from the Dockerfile. A typical use case would
|
|
# be to pass options to trigger cross-compilation
|
|
#
|
|
# $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's
|
|
# populated either from a GitLab's job configuration or from command line as
|
|
# `$ helper build --meson-configure-args=-Dopt1 -Dopt2` when run in a local
|
|
# containerized environment
|
|
#
|
|
# The contents of $MESON_ARGS (defined locally) should take precedence over
|
|
# those of $MESON_OPTS (defined when the container was built), so they're
|
|
# passed to meson after them
|
|
|
|
meson setup build --werror -Dsystem=true $MESON_OPTS $MESON_ARGS || \
|
|
(cat build/meson-logs/meson-log.txt && exit 1)
|
|
|
|
ninja -C build $NINJA_ARGS
|