mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
meson: bump required version to 0.54.0
This commit is contained in:
parent
78103450b4
commit
daf4e78e48
12
meson.build
12
meson.build
@ -10,7 +10,7 @@ project('systemd', 'c',
|
||||
'localstatedir=/var',
|
||||
'warning_level=2',
|
||||
],
|
||||
meson_version : '>= 0.53.2',
|
||||
meson_version : '>= 0.54.0',
|
||||
)
|
||||
|
||||
libsystemd_version = '0.36.0'
|
||||
@ -330,7 +330,7 @@ slow_tests = want_tests != 'false' and get_option('slow-tests')
|
||||
fuzz_tests = want_tests != 'false' and get_option('fuzz-tests')
|
||||
install_tests = get_option('install-tests')
|
||||
|
||||
if add_languages('cpp', required : fuzzer_build)
|
||||
if add_languages('cpp', native : false, required : fuzzer_build)
|
||||
# Used only for tests
|
||||
cxx = meson.get_compiler('cpp')
|
||||
cxx_cmd = ' '.join(cxx.cmd_array())
|
||||
@ -4449,8 +4449,8 @@ foreach test : tests
|
||||
versiondep,
|
||||
]
|
||||
|
||||
# FIXME: Use fs.stem() with meson >= 0.54.0
|
||||
name = '@0@'.format(sources[0]).split('/')[-1]
|
||||
# FIXME: Drop .format with meson >= 0.59.0
|
||||
name = fs.stem('@0@'.format(sources[0]))
|
||||
if not name.endswith('.cc')
|
||||
deps += [userspace]
|
||||
endif
|
||||
@ -4589,8 +4589,8 @@ foreach fuzzer : fuzzers
|
||||
endif
|
||||
sources += fuzz_generated_directives
|
||||
|
||||
# FIXME: Use fs.stem() with meson >= 0.54.0
|
||||
name = '@0@'.format(sources[0]).split('/')[-1].split('.')[0]
|
||||
# FIXME: Drop .format with meson >= 0.59.0
|
||||
name = fs.stem('@0@'.format(sources[0]))
|
||||
|
||||
exe = executable(
|
||||
name,
|
||||
|
Loading…
Reference in New Issue
Block a user