meson: bump required version to 0.55.0

This commit is contained in:
Yu Watanabe 2022-05-16 03:22:33 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent daf4e78e48
commit 573c0dc134

View file

@ -10,7 +10,7 @@ project('systemd', 'c',
'localstatedir=/var', 'localstatedir=/var',
'warning_level=2', 'warning_level=2',
], ],
meson_version : '>= 0.54.0', meson_version : '>= 0.55.0',
) )
libsystemd_version = '0.36.0' libsystemd_version = '0.36.0'
@ -735,7 +735,7 @@ foreach prog : progs
'/usr/sbin/' + prog[0], '/usr/sbin/' + prog[0],
'/sbin/' + prog[0], '/sbin/' + prog[0],
required: false) required: false)
path = exe.found() ? exe.path() : prog[1] path = exe.found() ? exe.full_path() : prog[1]
endif endif
name = prog.length() > 2 ? prog[2] : prog[0].to_upper() name = prog.length() > 2 ? prog[2] : prog[0].to_upper()
conf.set_quoted(name, path) conf.set_quoted(name, path)
@ -1123,7 +1123,7 @@ else
r = find_program('clang', required : bpf_framework_required, version : '>= 10.0.0') r = find_program('clang', required : bpf_framework_required, version : '>= 10.0.0')
clang_found = r.found() clang_found = r.found()
if clang_found if clang_found
clang = r.path() clang = r.full_path()
endif endif
else else
clang_found = true clang_found = true