shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

meson: bump required version to 0.54.0

Browse Source
This commit is contained in:
Yu Watanabe 2022-05-16 03:21:16 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 78103450b4
commit daf4e78e48
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -10,7 +10,7 @@ project('systemd', 'c',
'localstatedir=/var', 'localstatedir=/var',
'warning_level=2', 'warning_level=2',
], ],
meson_version : '>= 0.53.2', meson_version : '>= 0.54.0',
) )
libsystemd_version = '0.36.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') fuzz_tests = want_tests != 'false' and get_option('fuzz-tests')
install_tests = get_option('install-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 # Used only for tests
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
cxx_cmd = ' '.join(cxx.cmd_array()) cxx_cmd = ' '.join(cxx.cmd_array())
@ -4449,8 +4449,8 @@ foreach test : tests
versiondep, versiondep,
] ]
# FIXME: Use fs.stem() with meson >= 0.54.0 # FIXME: Drop .format with meson >= 0.59.0
name = '@0@'.format(sources[0]).split('/')[-1] name = fs.stem('@0@'.format(sources[0]))
if not name.endswith('.cc') if not name.endswith('.cc')
deps += [userspace] deps += [userspace]
endif endif
@ -4589,8 +4589,8 @@ foreach fuzzer : fuzzers
endif endif
sources += fuzz_generated_directives sources += fuzz_generated_directives
# FIXME: Use fs.stem() with meson >= 0.54.0 # FIXME: Drop .format with meson >= 0.59.0
name = '@0@'.format(sources[0]).split('/')[-1].split('.')[0] name = fs.stem('@0@'.format(sources[0]))
exe = executable( exe = executable(
name, name,