morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

meson: use more features provided by newer meson

Browse Source 
No functional change. Preparation for future bump of required meson
version.
This commit is contained in:
Yu Watanabe
2025-03-05 22:00:41 +09:00
parent c0cc01de8a
commit 51c086b9cc
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meson.build
View File

@@ -1245,18 +1245,30 @@ foreach ident : ['crypt_set_metadata_size',
endforeach
conf.set10('HAVE_LIBCRYPTSETUP', have)
# TODO: Use has_function(required : libcryptsetup_plugins) with meson >= 1.3.0
if libcryptsetup_plugins.allowed()
if meson.version().version_compare('>=1.3.0')
have = (cc.has_function(
'crypt_activate_by_token_pin',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup) and
dependencies : libcryptsetup,
required : libcryptsetup_plugins) and
cc.has_function(
'crypt_token_external_path',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup))
dependencies : libcryptsetup,
required : libcryptsetup_plugins))
else
have = false
if libcryptsetup_plugins.allowed()
have = (cc.has_function(
'crypt_activate_by_token_pin',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup) and
cc.has_function(
'crypt_token_external_path',
prefix : '#include <libcryptsetup.h>',
dependencies : libcryptsetup))
else
have = false
endif
endif
conf.set10('HAVE_LIBCRYPTSETUP_PLUGINS', have)

15
test/fuzz/meson.build
View File

@@ -36,13 +36,16 @@ fuzz_regression_tests += { 'fuzz-unit-file' : dict }
############################################################
# TODO: Use native string formatting with meson >= 1.3.0
if get_option('auto_features').enabled()
sanitize_auto_features = 'enabled'
elif get_option('auto_features').disabled()
sanitize_auto_features = 'disabled'
if meson.version().version_compare('>=1.3.0')
sanitize_auto_features = '@0@'.format(get_option('auto_features'))
else
sanitize_auto_features = 'auto'
if get_option('auto_features').enabled()
sanitize_auto_features = 'enabled'
elif get_option('auto_features').disabled()
sanitize_auto_features = 'disabled'
else
sanitize_auto_features = 'auto'
endif
endif
fuzz_c_args = get_option('c_args')