]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
meson: fix typoed copy-paste error that override other dependencies to blkid
authorEli Schwartz <eschwartz@archlinux.org>
Thu, 14 Apr 2022 19:24:27 +0000 (15:24 -0400)
committerEli Schwartz <eschwartz@archlinux.org>
Thu, 14 Apr 2022 23:47:56 +0000 (19:47 -0400)
libmount/meson.build
libsmartcols/meson.build
libuuid/meson.build

index 346d8054a631d3839f4c5beeb17ceffd64d1185f..c66ceb8e28cd96b555e63fd31401f6573bcf8ae9 100644 (file)
@@ -87,7 +87,7 @@ lib_mount = library(
                   get_option('cryptsetup-dlopen').enabled() ? lib_dl : lib_cryptsetup,
                   realtime_libs],
   install : build_libmount)
-mount_dep = declare_dependency(link_with: lib_blkid, include_directories: '.')
+mount_dep = declare_dependency(link_with: lib_mount, include_directories: '.')
 
 if build_libmount
   pkgconfig.generate(lib_mount,
@@ -95,7 +95,7 @@ if build_libmount
                      subdirs : 'libmount',
                      version : pc_version)
   if meson.version().version_compare('>=0.54.0')
-    meson.override_dependency('mount', blkid_dep)
+    meson.override_dependency('mount', mount_dep)
   endif
 endif
 
index 60c45c66ccd268edeacc4161d7894b7a65b6c4e4..3692c03ecc9c1b0c6bdd201b471b059fb5c6c0a3 100644 (file)
@@ -42,7 +42,7 @@ lib_smartcols = both_libraries(
   link_with : lib_common,
   dependencies : build_libsmartcols ? [] : disabler(),
   install : build_libsmartcols)
-smartcols_dep = declare_dependency(link_with: lib_blkid, include_directories: '.')
+smartcols_dep = declare_dependency(link_with: lib_smartcols, include_directories: '.')
 
 lib_smartcols_static = lib_smartcols.get_static_lib()
 
@@ -52,6 +52,6 @@ if build_libsmartcols
                      subdirs : 'libsmartcols',
                      version : pc_version)
   if meson.version().version_compare('>=0.54.0')
-    meson.override_dependency('smartcols', blkid_dep)
+    meson.override_dependency('smartcols', smartcols_dep)
   endif
 endif
index d08f80bef2bce12b35012911d2b3c59fa1da0d19..a801b4e656caca5d5f3af50a1fd6f0640cefda9e 100644 (file)
@@ -37,7 +37,7 @@ lib_uuid = both_libraries(
   dependencies : [socket_libs,
                   build_libuuid ? [] : disabler()],
   install : build_libuuid)
-uuid_dep = declare_dependency(link_with: lib_blkid, include_directories: dir_libuuid)
+uuid_dep = declare_dependency(link_with: lib_uuid, include_directories: dir_libuuid)
 
 if build_libuuid
   pkgconfig.generate(lib_uuid,
@@ -46,6 +46,6 @@ if build_libuuid
                      version : pc_version)
   install_headers('src/uuid.h', subdir : 'uuid')
   if meson.version().version_compare('>=0.54.0')
-    meson.override_dependency('uuid', blkid_dep)
+    meson.override_dependency('uuid', uuid_dep)
   endif
 endif