From 85915f312c4f83365d603a33f065cf6d648cab27 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 23 Dec 2023 09:56:31 +0100 Subject: [PATCH] meson: check for pefile dependency before enabling ukify ukify (and all the tests, including the autogenerated check-version-ukify) does not work unless pefile is available, so track it as a dependency in meson to avoid unit test failures later --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5ebc0a51e9..d1433e3dbc 100644 --- a/meson.build +++ b/meson.build @@ -1811,7 +1811,9 @@ if have and efi_arch == 'x64' and cc.links(''' efi_cpu_family_alt = 'x86' endif -want_ukify = get_option('ukify').require(python_39, error_message : 'Python >= 3.9 required').allowed() +pefile = pymod.find_installation('python3', required: false, modules : ['pefile']) + +want_ukify = get_option('ukify').require(python_39 and (want_tests != 'true' or pefile.found()), error_message : 'Python >= 3.9 and pefile required').allowed() conf.set10('ENABLE_UKIFY', want_ukify) #####################################################################