From c0234eab65534bf53fe4be3bf21d871031239804 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Fri, 4 Sep 2020 14:11:18 -0400 Subject: [PATCH] Spruce up pkg-config files for libzfs/libzfs_core Several of the listed library dependencies are not relevant on FreeBSD. Have ./configure save libraries that are found via pkg-config as ${LIB}_PC and use the configured automake variables instead of hard coded names so we only get what was actually needed. While here, update the URL to point at the OpenZFS Github repo. Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10869 --- config/find_system_library.m4 | 5 +++++ lib/libzfs/libzfs.pc.in | 4 ++-- lib/libzfs_core/libzfs_core.pc.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/find_system_library.m4 b/config/find_system_library.m4 index 9a95d6a15..310b44112 100644 --- a/config/find_system_library.m4 +++ b/config/find_system_library.m4 @@ -11,10 +11,12 @@ AC_DEFUN([ZFS_AC_FIND_SYSTEM_LIBRARY], [ _header_found= _library_found= + _pc_found= AS_IF([test -n "$2"], [PKG_CHECK_MODULES([$1], [$2], [ _header_found=1 _library_found=1 + _pc_found=1 ], [:])]) # set _header_found/_library_found if the user passed in CFLAGS/LIBS @@ -82,6 +84,9 @@ AC_DEFUN([ZFS_AC_FIND_SYSTEM_LIBRARY], [ AS_IF([test "x$_header_found" = "x1" && test "x$_library_found" = "x1"], [ AC_SUBST([$1]_CFLAGS) AC_SUBST([$1]_LIBS) + AS_IF([test "x$_pc_found" = "x1"], [ + AC_SUBST([$1]_PC, [$2]) + ]) AC_DEFINE([HAVE_][$1], [1], [Define if you have [$5]]) $7 ],[dnl ELSE diff --git a/lib/libzfs/libzfs.pc.in b/lib/libzfs/libzfs.pc.in index 6caf49d22..afe5635ae 100644 --- a/lib/libzfs/libzfs.pc.in +++ b/lib/libzfs/libzfs.pc.in @@ -6,9 +6,9 @@ includedir=@includedir@ Name: libzfs Description: LibZFS library Version: @VERSION@ -URL: https://zfsonlinux.org +URL: https://github.com/openzfs/zfs Requires: libzfs_core -Requires.private: libcrypto zlib +Requires.private: @LIBCRYPTO_PC@ @ZLIB_PC@ Cflags: -I${includedir}/libzfs -I${includedir}/libspl Libs: -L${libdir} -lzfs -lnvpair Libs.private: -luutil -lm -pthread diff --git a/lib/libzfs_core/libzfs_core.pc.in b/lib/libzfs_core/libzfs_core.pc.in index e14d42d11..bc9582ea3 100644 --- a/lib/libzfs_core/libzfs_core.pc.in +++ b/lib/libzfs_core/libzfs_core.pc.in @@ -6,8 +6,8 @@ includedir=@includedir@ Name: libzfs_core Description: LibZFS core library Version: @VERSION@ -URL: https://zfsonlinux.org -Requires.private: blkid uuid libtirpc zlib +URL: https://github.com/openzfs/zfs +Requires.private: @LIBBLKID_PC@ @LIBUUID_PC@ @LIBTIRPC_PC@ @ZLIB_PC@ Cflags: -I${includedir}/libzfs -I${includedir}/libspl Libs: -L${libdir} -lzfs_core -lnvpair Libs.private: @LIBCLOCK_GETTIME@ @LIBUDEV_LIBS@ -lm -pthread