From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 5 Mar 2025 13:00:41 +0000 (+0900)
Subject: meson: use more features provided by newer meson
X-Git-Tag: v258-rc1~1130^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F36610%2Fhead;p=thirdparty%2Fsystemd.git

meson: use more features provided by newer meson

No functional change. Preparation for future bump of required meson
version.
---

diff --git a/meson.build b/meson.build
index 26e3f2771fc..d87c651fc66 100644
--- a/meson.build
+++ b/meson.build
@@ -1245,18 +1245,30 @@ foreach ident : ['crypt_set_metadata_size',
 endforeach
 conf.set10('HAVE_LIBCRYPTSETUP', have)
 
-# TODO: Use has_function(required : libcryptsetup_plugins) with meson >= 1.3.0
-if libcryptsetup_plugins.allowed()
+if meson.version().version_compare('>=1.3.0')
         have = (cc.has_function(
                         'crypt_activate_by_token_pin',
                         prefix : '#include <libcryptsetup.h>',
-                        dependencies : libcryptsetup) and
+                        dependencies : libcryptsetup,
+                        required : libcryptsetup_plugins) and
                 cc.has_function(
                         'crypt_token_external_path',
                         prefix : '#include <libcryptsetup.h>',
-                        dependencies : libcryptsetup))
+                        dependencies : libcryptsetup,
+                        required : libcryptsetup_plugins))
 else
-        have = false
+        if libcryptsetup_plugins.allowed()
+                have = (cc.has_function(
+                                'crypt_activate_by_token_pin',
+                                prefix : '#include <libcryptsetup.h>',
+                                dependencies : libcryptsetup) and
+                        cc.has_function(
+                                'crypt_token_external_path',
+                                prefix : '#include <libcryptsetup.h>',
+                                dependencies : libcryptsetup))
+        else
+                have = false
+        endif
 endif
 conf.set10('HAVE_LIBCRYPTSETUP_PLUGINS', have)
 
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index 54cbb75532d..d88d6218d2f 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -36,13 +36,16 @@ fuzz_regression_tests += { 'fuzz-unit-file' : dict }
 
 ############################################################
 
-# TODO: Use native string formatting with meson >= 1.3.0
-if get_option('auto_features').enabled()
-        sanitize_auto_features = 'enabled'
-elif get_option('auto_features').disabled()
-        sanitize_auto_features = 'disabled'
+if meson.version().version_compare('>=1.3.0')
+        sanitize_auto_features = '@0@'.format(get_option('auto_features'))
 else
-        sanitize_auto_features = 'auto'
+        if get_option('auto_features').enabled()
+                sanitize_auto_features = 'enabled'
+        elif get_option('auto_features').disabled()
+                sanitize_auto_features = 'disabled'
+        else
+                sanitize_auto_features = 'auto'
+        endif
 endif
 
 fuzz_c_args = get_option('c_args')