From 45b545dd190422570f92ecdb50f844e59732a955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 14 Jan 2021 18:45:09 +0100 Subject: [PATCH] meson.build: Detect bzip2 program MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Suggested-by: Paolo Bonzini Fixes: c8d5450bba3 ("configure: move install_blobs from configure to meson") Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210114174509.2944817-3-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 2 ++ pc-bios/meson.build | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 94bbb4c757..35a9eddf5c 100644 --- a/meson.build +++ b/meson.build @@ -96,6 +96,8 @@ if get_option('install_blobs') 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 6a341b6cea..af95c5d1f1 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',