From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Thu, 30 Dec 2021 21:57:24 +0000 (+0100)
Subject: meson: only install pkgconfig if library is built
X-Git-Tag: v2.38-rc1~84^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f7734ae6a1da38ee513e3df1b3366fd31a8c079;p=thirdparty%2Futil-linux.git

meson: only install pkgconfig if library is built
---

diff --git a/libblkid/meson.build b/libblkid/meson.build
index 13ccf98dd6..6444bf39ba 100644
--- a/libblkid/meson.build
+++ b/libblkid/meson.build
@@ -144,7 +144,9 @@ lib_blkid = both_libraries(
 
 lib_blkid_static = lib_blkid.get_static_lib()
 
-pkgconfig.generate(lib_blkid,
-                   description : 'Block device id library',
-                   subdirs : 'blkid',
-                   version : pc_version)
+if build_libblkid
+  pkgconfig.generate(lib_blkid,
+                     description : 'Block device id library',
+                     subdirs : 'blkid',
+                     version : pc_version)
+endif
diff --git a/libfdisk/meson.build b/libfdisk/meson.build
index ea9c0168c7..c91dea8e5f 100644
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -75,7 +75,9 @@ lib_fdisk = library(
                lib_uuid],
   install : build_libfdisk)
 
-pkgconfig.generate(lib_fdisk,
-                   description : 'fdisk library',
-                   subdirs : 'libfdisk',
-                   version : pc_version)
+if build_libfdisk
+  pkgconfig.generate(lib_fdisk,
+                     description : 'fdisk library',
+                     subdirs : 'libfdisk',
+                     version : pc_version)
+endif
diff --git a/libmount/meson.build b/libmount/meson.build
index 060ccfd369..de4328f564 100644
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -88,9 +88,11 @@ lib_mount = library(
                   realtime_libs],
   install : build_libmount)
 
-pkgconfig.generate(lib_mount,
-                   description : 'mount library',
-                   subdirs : 'libmount',
-                   version : pc_version)
+if build_libmount
+  pkgconfig.generate(lib_mount,
+                     description : 'mount library',
+                     subdirs : 'libmount',
+                     version : pc_version)
+endif
 
 subdir('python')
diff --git a/libsmartcols/meson.build b/libsmartcols/meson.build
index 171a7796f0..11c4f08c96 100644
--- a/libsmartcols/meson.build
+++ b/libsmartcols/meson.build
@@ -45,7 +45,9 @@ lib_smartcols = both_libraries(
 
 lib_smartcols_static = lib_smartcols.get_static_lib()
 
-pkgconfig.generate(lib_smartcols,
-                   description : 'table or tree library',
-                   subdirs : 'libsmartcols',
-                   version : pc_version)
+if build_libsmartcols
+  pkgconfig.generate(lib_smartcols,
+                     description : 'table or tree library',
+                     subdirs : 'libsmartcols',
+                     version : pc_version)
+endif
diff --git a/libuuid/meson.build b/libuuid/meson.build
index a6dc794251..7d43c61c89 100644
--- a/libuuid/meson.build
+++ b/libuuid/meson.build
@@ -38,8 +38,10 @@ lib_uuid = both_libraries(
                   build_libuuid ? [] : disabler()],
   install : build_libuuid)
 
-pkgconfig.generate(lib_uuid,
-                   description : 'Universally unique id library',
-                   subdirs : 'uuid',
-                   version : pc_version)
-install_headers('src/uuid.h', subdir : 'uuid')
+if build_libuuid
+  pkgconfig.generate(lib_uuid,
+                     description : 'Universally unique id library',
+                     subdirs : 'uuid',
+                     version : pc_version)
+  install_headers('src/uuid.h', subdir : 'uuid')
+endif