From: Jordan Williams Date: Mon, 8 Apr 2024 16:37:01 +0000 (-0500) Subject: meson: Remove libblkid dependency on libmount X-Git-Tag: v2.42-start~418^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efce415c094e7daf2b0781c70129b4f0f05120d4;p=thirdparty%2Futil-linux.git meson: Remove libblkid dependency on libmount 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 --- diff --git a/meson.build b/meson.build index 21822f0bd..f448e6c8d 100644 --- a/meson.build +++ b/meson.build @@ -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')