From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Laszlo Ersek" <lersek@redhat.com>
Subject: [PATCH 2/2] meson.build: Detect bzip2 program
Date: Thu, 14 Jan 2021 18:45:09 +0100 [thread overview]
Message-ID: <20210114174509.2944817-3-philmd@redhat.com> (raw)
In-Reply-To: <20210114174509.2944817-1-philmd@redhat.com>
The --enable-bzip2/--disable-bzip2 configure arguments are
somehow misleading, they check for the bzip2 library, not
the bzip2 program.
We need the bzip2 program to install the EDK2 firmware blobs
(see commit 623ef637a2e "configure: Check bzip2 is available").
Check if the bzip2 program in the global meson.build to avoid
the configuration to succeed, but a later when trying to install
the firmware blobs:
../pc-bios/meson.build:5:2: ERROR: Program 'bzip2' not found
Reported-by: John Snow <jsnow@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Fixes: c8d5450bba3 ("configure: move install_blobs from configure to meson")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 2 ++
pc-bios/meson.build | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index ecc45d04d6a..954152c90fe 100644
--- a/meson.build
+++ b/meson.build
@@ -96,6 +96,8 @@
endforeach
endif
+bzip2 = find_program('bzip2', required: install_edk2_blobs)
+
##################
# Compiler flags #
##################
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 6a341b6cea0..af95c5d1f1d 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -1,5 +1,4 @@
if install_edk2_blobs
- bzip2 = find_program('bzip2', required: true)
fds = [
'edk2-aarch64-code.fd',
'edk2-arm-code.fd',
--
2.26.2
next prev parent reply other threads:[~2021-01-14 17:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 17:45 [PATCH 0/2] meson.build: Fix bzip2 program detection for EDK2 blobs installation Philippe Mathieu-Daudé
2021-01-14 17:45 ` [PATCH 1/2] meson.build: Declare global edk2_targets / install_edk2_blobs variables Philippe Mathieu-Daudé
2021-01-14 19:49 ` Laszlo Ersek
2021-01-14 19:57 ` Philippe Mathieu-Daudé
2021-01-14 20:05 ` Laszlo Ersek
2021-01-14 17:45 ` Philippe Mathieu-Daudé [this message]
2021-01-14 19:10 ` [PATCH 2/2] meson.build: Detect bzip2 program John Snow
2021-01-14 19:50 ` Laszlo Ersek
2021-01-14 19:46 ` [PATCH 0/2] meson.build: Fix bzip2 program detection for EDK2 blobs installation Paolo Bonzini
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=20210114174509.2944817-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=jsnow@redhat.com \
--cc=lersek@redhat.com \
--cc=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).