From 9247df5a8852d11b64a6309d994e3d2afe275250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 27 Jul 2021 16:16:07 +0200
Subject: [PATCH] meson: require 0.53.2 and drop some workarounds for old meson

Ubuntu Bionic 18.04 has 0.45, so it was below the previously required
minimum version already. Focal 20.04 has 0.53.2. Let's require that
and use various features that are available.
---
 meson.build            | 13 +++++--------
 tmpfiles.d/meson.build |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index cb023f7f132..84f288c6647 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ project('systemd', 'c',
                 'localstatedir=/var',
                 'warning_level=2',
         ],
-        meson_version : '>= 0.47',
+        meson_version : '>= 0.53.2',
        )
 
 libsystemd_version = '0.32.0'
@@ -382,7 +382,7 @@ if cc.get_id() == 'gcc'
 endif
 
 # --as-needed and --no-undefined are provided by meson by default,
-# run mesonconf to see what is enabled
+# run 'meson configure' to see what is enabled
 possible_link_flags = [
         '-Wl,-z,relro',
         '-Wl,-z,now',
@@ -597,7 +597,7 @@ test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
 mkdir_p = 'mkdir -p $DESTDIR/@0@'
 splash_bmp = files('test/splash.bmp')
 
-# if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
+# If -Dxxx-path option is found, use that. Otherwise, check in $PATH,
 # /usr/sbin, /sbin, and fall back to the default from middle column.
 progs = [['quotaon',    '/usr/sbin/quotaon'    ],
          ['quotacheck', '/usr/sbin/quotacheck' ],
@@ -909,10 +909,6 @@ conf.set10('LOG_TRACE', get_option('log-trace'))
 default_user_path = get_option('user-path')
 if default_user_path != ''
         conf.set_quoted('DEFAULT_USER_PATH', default_user_path)
-        default_user_path_display = default_user_path
-else
-        # meson 0.49 fails when ?: is used in .format()
-        default_user_path_display = '(same as system services)'
 endif
 
 
@@ -3817,7 +3813,8 @@ status = [
         'default net.naming-scheme setting: @0@'.format(default_net_naming_scheme),
         'default KillUserProcesses setting: @0@'.format(kill_user_processes),
         'default locale:                    @0@'.format(default_locale),
-        'default user $PATH:                @0@'.format(default_user_path_display),
+        'default user $PATH:                @0@'.format(
+                default_user_path != '' ? default_user_path : '(same as system services)'),
         'systemd service watchdog:          @0@'.format(watchdog_opt)]
 
 alt_dns_servers = '\n                                            '.join(dns_servers.split(' '))
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 6f8ff09fc8c..e0e339cd42b 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -37,8 +37,7 @@ foreach pair : in_files
                 # do nothing
         elif pair[1] == '' or conf.get(pair[1]) == 1
                 custom_target(
-                        # XXX: workaround for old meson. Drop when upgrading.
-                        'tmpfiles+' + pair[0],
+                        pair[0],
                         input : pair[0] + '.in',
                         output: pair[0],
                         command : [meson_render_jinja2, config_h, '@INPUT@'],