From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Michal Privoznik <mprivozn@redhat.com>
Subject: [PULL 2/3] configure: check for $download value properly
Date: Wed, 7 Jun 2023 17:47:23 +0200 [thread overview]
Message-ID: <20230607154724.253659-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20230607154724.253659-1-pbonzini@redhat.com>
From: Michal Privoznik <mprivozn@redhat.com>
If configure was invoked with --disable-download and git
submodules were not checked out a warning is produced and the
configure script fails. But the $download variable (which
reflects the enable/disable download argument) is checked for in
a weird fashion:
test -f "$download" = disabled
Drop the '-f' to check for the actual value of the variable.
Fixes: 2019cabfee0 ("meson: subprojects: replace submodules with wrap files", 2023-06-06)
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 8765b88e12f..8a638dd82ae 100755
--- a/configure
+++ b/configure
@@ -767,7 +767,7 @@ if test "$plugins" = "yes" -a "$tcg" = "disabled"; then
fi
if ! test -f "$source_path/subprojects/keycodemapdb/README" \
- && test -f "$download" = disabled
+ && test "$download" = disabled
then
echo
echo "ERROR: missing subprojects"
--
2.40.1
next prev parent reply other threads:[~2023-06-07 15:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 15:47 [PULL 0/3] SNAFU build system fixes for 2023-06-07 Paolo Bonzini
2023-06-07 15:47 ` [PULL 1/3] meson: fix "static build" entry in summary Paolo Bonzini
2023-06-07 15:47 ` Paolo Bonzini [this message]
2023-06-07 15:47 ` [PULL 3/3] tests: fp: remove unused submodules Paolo Bonzini
2023-06-08 14:47 ` [PULL 0/3] SNAFU build system fixes for 2023-06-07 Richard Henderson
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=20230607154724.253659-3-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=mprivozn@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).