]> git.proxmox.com Git - mirror_zfs.git/commit
Clean up lib dependencies
authorArvind Sankar <nivedita@alum.mit.edu>
Tue, 30 Jun 2020 17:10:41 +0000 (13:10 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 10 Jul 2020 21:26:00 +0000 (14:26 -0700)
commit4d61ade1a317606dc899e38b516410a0c2fdae0e
treed6c2003638fe28b2fe341515aaded236d6c1320f
parentb6437ea41c7611481925d72d294677434639b847
Clean up lib dependencies

libzutil is currently statically linked into libzfs, libzfs_core and
libzpool. Avoid the unnecessary duplication by removing it from libzfs
and libzpool, and adding libzfs_core to libzpool.

Remove a few unnecessary dependencies:
- libuutil from libzfs_core
- libtirpc from libspl
- keep only libcrypto in libzfs, as we don't use any functions from
  libssl
- librt is only used for clock_gettime, however on modern systems that's
  in libc rather than librt. Add a configure check to see if we actually
  need librt
- libdl from raidz_test

Add a few missing dependencies:
- zlib to libefi and libzfs
- libuuid to zpool, and libuuid and libudev to zed
- libnvpair uses assertions, so add assert.c to provide aok and
  libspl_assertf

Sort the LDADD for programs so that libraries that satisfy dependencies
come at the end rather than the beginning of the linker command line.

Revamp the configure tests for libaries to use FIND_SYSTEM_LIBRARY
instead. This can take advantage of pkg-config, and it also avoids
polluting LIBS.

List all the required dependencies in the pkgconfig files, and move the
one for libzfs_core into the latter's directory. Install pkgconfig files
in $(libdir)/pkgconfig on linux and $(prefix)/libdata/pkgconfig on
FreeBSD, instead of /usr/share/pkgconfig, as the more correct location
for library .pc files.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10538
46 files changed:
cmd/mount_zfs/Makefile.am
cmd/raidz_test/Makefile.am
cmd/zdb/Makefile.am
cmd/zed/Makefile.am
cmd/zfs/Makefile.am
cmd/zhack/Makefile.am
cmd/zinject/Makefile.am
cmd/zpool/Makefile.am
cmd/zstream/Makefile.am
cmd/ztest/Makefile.am
config/find_system_library.m4
config/user-clock_gettime.m4 [new file with mode: 0644]
config/user-libaio.m4
config/user-libblkid.m4
config/user-libcrypto.m4 [new file with mode: 0644]
config/user-libssl.m4 [deleted file]
config/user-libudev.m4
config/user-libuuid.m4
config/user-zlib.m4
config/user.m4
configure.ac
contrib/pam_zfs_key/Makefile.am
lib/Makefile.am
lib/libefi/Makefile.am
lib/libicp/Makefile.am
lib/libnvpair/Makefile.am
lib/libspl/Makefile.am
lib/libtpool/Makefile.am
lib/libuutil/Makefile.am
lib/libzfs/.gitignore
lib/libzfs/Makefile.am
lib/libzfs/libzfs.pc.in
lib/libzfs/libzfs_core.pc.in [deleted file]
lib/libzfs_core/.gitignore [new file with mode: 0644]
lib/libzfs_core/Makefile.am
lib/libzfs_core/libzfs_core.pc.in [new file with mode: 0644]
lib/libzpool/Makefile.am
lib/libzutil/Makefile.am
rpm/generic/zfs.spec.in
tests/zfs-tests/cmd/btree_test/Makefile.am
tests/zfs-tests/cmd/libzfs_input_check/Makefile.am
tests/zfs-tests/cmd/mmap_libaio/Makefile.am
tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am
tests/zfs-tests/tests/functional/checksum/Makefile.am
tests/zfs-tests/tests/functional/hkdf/Makefile.am
tests/zfs-tests/tests/functional/libzfs/Makefile.am