system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

meson: ukify depends on GNU_EFI

Browse source 
ukify is rather efi specific and the manpage is already conditional on
HAVE_GNU_EFI so make the program also depend on HAVE_GNU_EFI
This commit is contained in:
Ludwig Nussel 2023-01-18 10:25:58 +01:00 committed by Luca Boccassi
parent 78d774bab4
commit d7efb17068
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
meson.build
View file

@ -716,24 +716,6 @@ endif
############################################################
python = find_program('python3')
if run_command(python, '-c', 'import jinja2', check : false).returncode() != 0
error('python3 jinja2 missing')
endif
python_310 = run_command(python, '-c',
'import sys; sys.exit(0 if sys.version_info >= (3,10) else 1)',
check : false).returncode() == 0
if get_option('ukify') == 'auto'
want_ukify = python_310
elif get_option('ukify') == 'true' and not python310
error('ukify requires Python >= 3.10')
else
want_ukify = get_option('ukify') == 'true'
endif
############################################################
gperf = find_program('gperf')
gperf_test_format = '''
@ -1989,6 +1971,24 @@ jinja2_cmdline = [meson_render_jinja2, config_h, version_h]
############################################################
python = find_program('python3')
if run_command(python, '-c', 'import jinja2', check : false).returncode() != 0
error('python3 jinja2 missing')
endif
python_310 = run_command(python, '-c',
'import sys; sys.exit(0 if sys.version_info >= (3,10) else 1)',
check : false).returncode() == 0
if get_option('ukify') == 'auto'
want_ukify = python_310 and conf.get('HAVE_GNU_EFI') == 1
elif get_option('ukify') == 'true' and (not python310 or conf.get('HAVE_GNU_EFI') != 1)
error('ukify requires Python >= 3.10 and GNU EFI')
else
want_ukify = get_option('ukify') == 'true'
endif
############################################################
# binaries that have --help and are intended for use by humans,
# usually, but not always, installed in /bin.
public_programs = []