meson: Convert fidsk to meson feature

By making this a disabler dependency, we can slightly simplify the code
and it als fixes the build for -Dfdisk=disabled as we failed to create a
fallback empty libshared_fdisk variable.

diff --git a/meson.build b/meson.build
index 63f2785539632fe3f3f44acf32c96fa2f6de8dcf..aee3dffe1211e04e8d8dadc1485d9b9ec89af054 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1119,17 +1119,11 @@ endif
 libmount = dependency('mount',
                       version : fuzzer_build ? '>= 0' : '>= 2.30')
 
-want_libfdisk = get_option('fdisk')
-if want_libfdisk != 'false' and not skip_deps
-        libfdisk = dependency('fdisk',
-                              version : '>= 2.32',
-                              required : want_libfdisk == 'true')
-        have = libfdisk.found()
-else
-        have = false
-        libfdisk = []
-endif
-conf.set10('HAVE_LIBFDISK', have)
+libfdisk = dependency('fdisk',
+                      version : '>= 2.32',
+                      disabler : true,
+                      required : get_option('fdisk'))
+conf.set10('HAVE_LIBFDISK', libfdisk.found())
 
 want_passwdqc = get_option('passwdqc')
 want_pwquality = get_option('pwquality')

diff --git a/meson_options.txt b/meson_options.txt
index 3e73520dd458a6510a6fe6986ef5ccc5a8c9bcf7..894116f750bc883d2c9c6338a468be98d99a2326 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -373,7 +373,7 @@ option('audit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : '
        description : 'libaudit support')
 option('blkid', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'libblkid support')
-option('fdisk', type : 'combo', choices : ['auto', 'true', 'false'],
+option('fdisk', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'libfdisk support')
 option('kmod', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'support for loadable modules')

diff --git a/mkosi.presets/base/mkosi.build b/mkosi.presets/base/mkosi.build
index f2a7560070ae6ec2898c094a99d16c0cd790afc7..89124bcb1c9290579bc029e6b693a3379c7405c9 100755 (executable)
--- a/mkosi.presets/base/mkosi.build
+++ b/mkosi.presets/base/mkosi.build
@@ -120,7 +120,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         -D acl=enabled
         -D audit=enabled
         -D blkid=enabled
-        -D fdisk=true
+        -D fdisk=enabled
         -D kmod=enabled
         -D pam=true
         -D pwquality=true

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 2930e8c3547dbbb324b1f829cf660ab2e87ae00e..2c18ab43dd8d89dc5bceda1c5dd8669ab13dacf0 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -344,13 +344,11 @@ shared_fdisk_sources = files(
         'fdisk-util.c',
 )
 
-if get_option('fdisk') != 'false'
-        libshared_fdisk = static_library(
-                'shared-fdisk',
-                shared_fdisk_sources,
-                include_directories : includes,
-                dependencies : [libfdisk,
-                                userspace],
-                c_args : ['-fvisibility=default'],
-                build_by_default : false)
-endif
+libshared_fdisk = static_library(
+        'shared-fdisk',
+        shared_fdisk_sources,
+        include_directories : includes,
+        dependencies : [libfdisk,
+                        userspace],
+        c_args : ['-fvisibility=default'],
+        build_by_default : false)