From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 10/10] gitlab-ci: use --meson=internal for CFI jobs
Date: Sat, 1 May 2021 11:30:26 +0200 [thread overview]
Message-ID: <20210501093026.189429-11-pbonzini@redhat.com> (raw)
In-Reply-To: <20210501093026.189429-1-pbonzini@redhat.com>
If we use the system Meson but it is too old, the subsequent "meson configure"
will fail. Always use the submodule when building with CFI.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitlab-ci.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d65d6c04..dcb6317aac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,17 +19,21 @@ include:
before_script:
- JOBS=$(expr $(nproc) + 1)
script:
+ - if test -n "$LD_JOBS";
+ then
+ scripts/git-submodule.sh update meson ;
+ fi
- mkdir build
- cd build
- if test -n "$TARGETS";
then
- ../configure --enable-werror --disable-docs $CONFIGURE_ARGS --target-list="$TARGETS" ;
+ ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=internal} $CONFIGURE_ARGS --target-list="$TARGETS" ;
else
- ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ;
+ ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=internal} $CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS";
then
- meson configure . -Dbackend_max_links="$LD_JOBS" ;
+ ../meson/meson.py configure . -Dbackend_max_links="$LD_JOBS" ;
fi || exit 1;
- make -j"$JOBS"
- if test -n "$MAKE_CHECK_ARGS";
--
2.31.1
next prev parent reply other threads:[~2021-05-01 9:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-01 9:30 [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator) Paolo Bonzini
2021-05-01 9:30 ` [PULL 01/10] oslib-win32: do not rely on macro to get redefined function name Paolo Bonzini
2021-05-01 9:30 ` [PULL 02/10] Add NVMM accelerator: configure and build logic Paolo Bonzini
2021-05-01 9:30 ` [PULL 03/10] Add NVMM accelerator: x86 CPU support Paolo Bonzini
2021-05-01 9:30 ` [PULL 04/10] Add NVMM accelerator: acceleration enlightenments Paolo Bonzini
2021-05-01 9:30 ` [PULL 05/10] Add NVMM Accelerator: add maintainers for NetBSD/NVMM Paolo Bonzini
2021-05-01 9:30 ` [PULL 06/10] ratelimit: protect with a mutex Paolo Bonzini
2021-05-01 9:30 ` [PULL 07/10] slirp: add configure option to disable smbd Paolo Bonzini
2021-05-01 9:30 ` [PULL 08/10] configure: reindent meson invocation Paolo Bonzini
2021-05-01 9:30 ` [PULL 09/10] configure: handle meson options that have changed type Paolo Bonzini
2021-05-01 9:30 ` Paolo Bonzini [this message]
2021-05-01 14:14 ` [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210501093026.189429-11-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).