Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10869
This commit is contained in:
Ryan Moeller 2020-09-04 14:11:18 -04:00 committed by GitHub
parent 3ec88ab205
commit ef55446a9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/find_system_library.m4
View File

@ -11,10 +11,12 @@ AC_DEFUN([ZFS_AC_FIND_SYSTEM_LIBRARY], [
_header_found= _header_found=
_library_found= _library_found=
_pc_found=
AS_IF([test -n "$2"], [PKG_CHECK_MODULES([$1], [$2], [ AS_IF([test -n "$2"], [PKG_CHECK_MODULES([$1], [$2], [
_header_found=1 _header_found=1
_library_found=1 _library_found=1
_pc_found=1
], [:])]) ], [:])])
# set _header_found/_library_found if the user passed in CFLAGS/LIBS # 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"], [ AS_IF([test "x$_header_found" = "x1" && test "x$_library_found" = "x1"], [
AC_SUBST([$1]_CFLAGS) AC_SUBST([$1]_CFLAGS)
AC_SUBST([$1]_LIBS) 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]]) AC_DEFINE([HAVE_][$1], [1], [Define if you have [$5]])
$7 $7
],[dnl ELSE ],[dnl ELSE

4
lib/libzfs/libzfs.pc.in
View File

@ -6,9 +6,9 @@ includedir=@includedir@
Name: libzfs Name: libzfs
Description: LibZFS library Description: LibZFS library
Version: @VERSION@ Version: @VERSION@
URL: https://zfsonlinux.org URL: https://github.com/openzfs/zfs
Requires: libzfs_core Requires: libzfs_core
Requires.private: libcrypto zlib Requires.private: @LIBCRYPTO_PC@ @ZLIB_PC@
Cflags: -I${includedir}/libzfs -I${includedir}/libspl Cflags: -I${includedir}/libzfs -I${includedir}/libspl
Libs: -L${libdir} -lzfs -lnvpair Libs: -L${libdir} -lzfs -lnvpair
Libs.private: -luutil -lm -pthread Libs.private: -luutil -lm -pthread

4
lib/libzfs_core/libzfs_core.pc.in
View File

@ -6,8 +6,8 @@ includedir=@includedir@
Name: libzfs_core Name: libzfs_core
Description: LibZFS core library Description: LibZFS core library
Version: @VERSION@ Version: @VERSION@
URL: https://zfsonlinux.org URL: https://github.com/openzfs/zfs
Requires.private: blkid uuid libtirpc zlib Requires.private: @LIBBLKID_PC@ @LIBUUID_PC@ @LIBTIRPC_PC@ @ZLIB_PC@
Cflags: -I${includedir}/libzfs -I${includedir}/libspl Cflags: -I${includedir}/libzfs -I${includedir}/libspl
Libs: -L${libdir} -lzfs_core -lnvpair Libs: -L${libdir} -lzfs_core -lnvpair
Libs.private: @LIBCLOCK_GETTIME@ @LIBUDEV_LIBS@ -lm -pthread Libs.private: @LIBCLOCK_GETTIME@ @LIBUDEV_LIBS@ -lm -pthread