From ff5becf585eeab3f47fe532180c682363fe4c3b3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 16 May 2022 03:53:01 +0900 Subject: [PATCH] meson: bump required version to 0.59.0 fs.stemp() and fs.name() can take File object since 0.59.0. --- meson.build | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 76f57c0fb2..b275718ee6 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ project('systemd', 'c', 'localstatedir=/var', 'warning_level=2', ], - meson_version : '>= 0.56.0', + meson_version : '>= 0.59.0', ) libsystemd_version = '0.36.0' @@ -4454,16 +4454,13 @@ foreach test : tests versiondep, ] - # FIXME: Drop .format with meson >= 0.59.0 - name = fs.stem('@0@'.format(sources[0])) + name = fs.stem(sources[0]) if not name.endswith('.cc') deps += [userspace] endif name = name.split('.')[0] - suite = fs.name(fs.parent('@0@'.format(sources[0]))) - # FIXME: Use str.replace() with meson >= 0.58.0 - suite = suite.split('sd-')[-1] + suite = fs.name(fs.parent(sources[0])).replace('sd-', '') if condition != '' and conf.get(condition) == 0 message('Not compiling @0@ because @1@ is not true'.format(name, condition)) @@ -4594,8 +4591,7 @@ foreach fuzzer : fuzzers endif sources += fuzz_generated_directives - # FIXME: Drop .format with meson >= 0.59.0 - name = fs.stem('@0@'.format(sources[0])) + name = fs.stem(sources[0]) exe = executable( name,