mirror of
https://github.com/systemd/systemd.git
synced 2025-01-10 05:18:17 +03:00
meson: bump required version to 0.59.0
fs.stemp() and fs.name() can take File object since 0.59.0.
This commit is contained in:
parent
2bd6f87e95
commit
ff5becf585
12
meson.build
12
meson.build
@ -10,7 +10,7 @@ project('systemd', 'c',
|
|||||||
'localstatedir=/var',
|
'localstatedir=/var',
|
||||||
'warning_level=2',
|
'warning_level=2',
|
||||||
],
|
],
|
||||||
meson_version : '>= 0.56.0',
|
meson_version : '>= 0.59.0',
|
||||||
)
|
)
|
||||||
|
|
||||||
libsystemd_version = '0.36.0'
|
libsystemd_version = '0.36.0'
|
||||||
@ -4454,16 +4454,13 @@ foreach test : tests
|
|||||||
versiondep,
|
versiondep,
|
||||||
]
|
]
|
||||||
|
|
||||||
# FIXME: Drop .format with meson >= 0.59.0
|
name = fs.stem(sources[0])
|
||||||
name = fs.stem('@0@'.format(sources[0]))
|
|
||||||
if not name.endswith('.cc')
|
if not name.endswith('.cc')
|
||||||
deps += [userspace]
|
deps += [userspace]
|
||||||
endif
|
endif
|
||||||
name = name.split('.')[0]
|
name = name.split('.')[0]
|
||||||
|
|
||||||
suite = fs.name(fs.parent('@0@'.format(sources[0])))
|
suite = fs.name(fs.parent(sources[0])).replace('sd-', '')
|
||||||
# FIXME: Use str.replace() with meson >= 0.58.0
|
|
||||||
suite = suite.split('sd-')[-1]
|
|
||||||
|
|
||||||
if condition != '' and conf.get(condition) == 0
|
if condition != '' and conf.get(condition) == 0
|
||||||
message('Not compiling @0@ because @1@ is not true'.format(name, condition))
|
message('Not compiling @0@ because @1@ is not true'.format(name, condition))
|
||||||
@ -4594,8 +4591,7 @@ foreach fuzzer : fuzzers
|
|||||||
endif
|
endif
|
||||||
sources += fuzz_generated_directives
|
sources += fuzz_generated_directives
|
||||||
|
|
||||||
# FIXME: Drop .format with meson >= 0.59.0
|
name = fs.stem(sources[0])
|
||||||
name = fs.stem('@0@'.format(sources[0]))
|
|
||||||
|
|
||||||
exe = executable(
|
exe = executable(
|
||||||
name,
|
name,
|
||||||
|
Loading…
Reference in New Issue
Block a user