From: Eli Schwartz <eschwartz@archlinux.org>
Date: Wed, 13 Apr 2022 01:23:34 +0000 (-0400)
Subject: meson: export dependencies as declared dependencies
X-Git-Tag: v2.39-rc1~714
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a246498349939c832489c96ed03580bcf9e46b14;p=thirdparty%2Futil-linux.git

meson: export dependencies as declared dependencies

This allows util-linux to be built as a subproject in order to provide
an alternative to a system version of e.g. fdisk.pc, uuid.pc
---

diff --git a/libblkid/meson.build b/libblkid/meson.build
index 6444bf39ba..6e9d28208d 100644
--- a/libblkid/meson.build
+++ b/libblkid/meson.build
@@ -141,6 +141,7 @@ lib_blkid = both_libraries(
   link_with : lib_common,
   dependencies : build_libblkid ? [] : disabler(),
   install : build_libblkid)
+blkid_dep = declare_dependency(link_with: lib_blkid, include_directories: '.')
 
 lib_blkid_static = lib_blkid.get_static_lib()
 
@@ -149,4 +150,7 @@ if build_libblkid
                      description : 'Block device id library',
                      subdirs : 'blkid',
                      version : pc_version)
+  if meson.version().version_compare('>=0.54.0')
+    meson.override_dependency('blkid', blkid_dep)
+  endif
 endif
diff --git a/libfdisk/meson.build b/libfdisk/meson.build
index 1debb2122b..22cf663738 100644
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -74,10 +74,14 @@ lib_fdisk = library(
                lib_blkid,
                lib_uuid],
   install : build_libfdisk)
+fdisk_dep = declare_dependency(link_with: lib_fdisk, include_directories: '.')
 
 if build_libfdisk
   pkgconfig.generate(lib_fdisk,
                      description : 'fdisk library',
                      subdirs : 'libfdisk',
                      version : pc_version)
+  if meson.version().version_compare('>=0.54.0')
+    meson.override_dependency('fdisk', fdisk_dep)
+  endif
 endif
diff --git a/libmount/meson.build b/libmount/meson.build
index de4328f564..f5e2c34484 100644
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -87,12 +87,16 @@ 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: '.')
 
 if build_libmount
   pkgconfig.generate(lib_mount,
                      description : 'mount library',
                      subdirs : 'libmount',
                      version : pc_version)
+  if meson.version().version_compare('>=0.54.0')
+    meson.override_dependency('mount', blkid_dep)
+  endif
 endif
 
 subdir('python')
diff --git a/libsmartcols/meson.build b/libsmartcols/meson.build
index 11c4f08c96..60c45c66cc 100644
--- a/libsmartcols/meson.build
+++ b/libsmartcols/meson.build
@@ -42,6 +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: '.')
 
 lib_smartcols_static = lib_smartcols.get_static_lib()
 
@@ -50,4 +51,7 @@ if build_libsmartcols
                      description : 'table or tree library',
                      subdirs : 'libsmartcols',
                      version : pc_version)
+  if meson.version().version_compare('>=0.54.0')
+    meson.override_dependency('smartcols', blkid_dep)
+  endif
 endif
diff --git a/libuuid/meson.build b/libuuid/meson.build
index 7d43c61c89..d08f80bef2 100644
--- a/libuuid/meson.build
+++ b/libuuid/meson.build
@@ -37,6 +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)
 
 if build_libuuid
   pkgconfig.generate(lib_uuid,
@@ -44,4 +45,7 @@ if build_libuuid
                      subdirs : 'uuid',
                      version : pc_version)
   install_headers('src/uuid.h', subdir : 'uuid')
+  if meson.version().version_compare('>=0.54.0')
+    meson.override_dependency('uuid', blkid_dep)
+  endif
 endif