]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
meson: Remove libblkid dependency on libmount
authorJordan Williams <jordan@jwillikers.com>
Mon, 8 Apr 2024 16:37:01 +0000 (11:37 -0500)
committerJordan Williams <jordan@jwillikers.com>
Wed, 10 Apr 2024 12:16:00 +0000 (07:16 -0500)
I added this incorrect dependency between libblkid and libmount.
The option to build libblkid should be allowed whether or not the
build-libmount feature is allowed.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
meson.build

index 21822f0bd426ea0e863edaf74d5077a09fcd385d..f448e6c8d90897b817af2fcb2de0aa4d2be98320 100644 (file)
@@ -78,7 +78,7 @@ conf.set_quoted('ADJTIME_PATH', '/etc/adjtime') # yes, both are used :(
 conf.set_quoted('_PATH_VENDORDIR', vendordir)
 conf.set('USE_VENDORDIR', vendordir == '' ? false : 1)
 
-build_libblkid = not get_option('build-libblkid').require(get_option('build-libmount').allowed()).disabled()
+build_libblkid = get_option('build-libblkid').allowed()
 conf.set('HAVE_LIBBLKID', build_libblkid ? 1 : false)
 summary('libblkid', build_libblkid ? 'enabled' : 'disabled', section : 'components')