c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up lib dependencies

Browse Source 
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
This commit is contained in:
Arvind Sankar
2020-06-30 13:10:41 -04:00
committed by Brian Behlendorf
parent b6437ea41c
commit 4d61ade1a3
45 changed files with 171 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Makefile.am
+4 -4
View File
@@ -1,5 +1,5 @@
# NB: GNU Automake Manual, Chapter 8.3.5: Libtool Convenience Libraries
# These six libraries are intermediary build components.
# These eight libraries are intermediary build components.
SUBDIRS = libavl libicp libshare libspl libtpool
if BUILD_LINUX
@@ -9,6 +9,6 @@ endif
# libzutil depends on libefi if present
SUBDIRS += libzutil libunicode
# These four libraries, which are installed as the final build product,
# incorporate the six convenience libraries given above.
SUBDIRS += libuutil libnvpair libzpool libzfs_core libzfs
# These five libraries, which are installed as the final build product,
# incorporate the eight convenience libraries given above.
SUBDIRS += libuutil libnvpair libzfs_core libzfs libzpool
lib/libefi/Makefile.am
+3 -1
View File
@@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(LIBUUID_CFLAGS) $(ZLIB_CFLAGS)
noinst_LTLIBRARIES = libefi.la
USER_C = \
@@ -7,4 +9,4 @@ USER_C = \
libefi_la_SOURCES = $(USER_C)
libefi_la_LIBADD = $(LIBUUID)
libefi_la_LIBADD = $(LIBUUID_LIBS) $(ZLIB_LIBS)
lib/libicp/Makefile.am
-2
View File
@@ -71,5 +71,3 @@ KERNEL_ASM = $(ASM_SOURCES_AS)
nodist_libicp_la_SOURCES = \
$(KERNEL_C) \
$(KERNEL_ASM)
libicp_la_LIBADD = -lrt
lib/libnvpair/Makefile.am
+7 -2
View File
@@ -26,10 +26,15 @@ dist_libnvpair_la_SOURCES = \
nodist_libnvpair_la_SOURCES = \
$(KERNEL_C)
libnvpair_la_LIBADD = \
$(top_builddir)/lib/libspl/libspl_assert.la
libnvpair_la_LIBADD += \
$(LIBTIRPC_LIBS)
if BUILD_FREEBSD
libnvpair_la_LIBADD = $(LIBTIRPC_LIBS) -L/usr/local/lib -lintl
libnvpair_la_LIBADD += -L/usr/local/lib -lintl
libnvpair_la_LDFLAGS = -version-info 3:0:0
else
libnvpair_la_LIBADD = $(LIBTIRPC_LIBS)
libnvpair_la_LDFLAGS = -version-info 1:1:0
endif
lib/libspl/Makefile.am
+1 -3
View File
@@ -12,8 +12,6 @@ endif
SUBDIRS = include
AM_CFLAGS += $(LIBTIRPC_CFLAGS)
AM_CCASFLAGS = \
$(CFLAGS)
@@ -55,4 +53,4 @@ libspl_la_SOURCES = \
libspl_la_LIBADD = \
libspl_assert.la
libspl_la_LIBADD += -lrt $(LIBTIRPC_LIBS)
libspl_la_LIBADD += $(LIBCLOCK_GETTIME)
lib/libtpool/Makefile.am
-5
View File
@@ -7,8 +7,3 @@ USER_C = \
thread_pool_impl.h
libtpool_la_SOURCES = $(USER_C)
libtpool_la_LIBADD = \
$(top_builddir)/lib/libspl/libspl.la
libtpool_la_LDFLAGS = -pthread
lib/libuutil/Makefile.am
+4 -2
View File
@@ -19,8 +19,10 @@ libuutil_la_LIBADD = \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la
libuutil_la_LDFLAGS = -pthread
if BUILD_FREEBSD
libuutil_la_LDFLAGS = -pthread -version-info 3:0:0
libuutil_la_LDFLAGS += -version-info 3:0:0
else
libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
libuutil_la_LDFLAGS += -version-info 1:1:0
endif
lib/libzfs/.gitignore
-1
View File
@@ -1,2 +1 @@
/libzfs.pc
/libzfs_core.pc
lib/libzfs/Makefile.am
+14 -11
View File
@@ -7,9 +7,9 @@ VPATH = \
# Suppress unused but set variable warnings often due to ASSERTs
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
AM_CFLAGS += $(LIBCRYPTO_CFLAGS) $(ZLIB_CFLAGS)
libzfs_pcdir = $(datarootdir)/pkgconfig
libzfs_pc_DATA = libzfs.pc libzfs_core.pc
pkgconfig_DATA = libzfs.pc
lib_LTLIBRARIES = libzfs.la
@@ -69,25 +69,28 @@ dist_libzfs_la_SOURCES = \
nodist_libzfs_la_SOURCES = \
$(KERNEL_C)
libzfs_la_LIBADD = \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
$(top_builddir)/lib/libzutil/libzutil.la
libzfs_la_LIBADD =
if BUILD_LINUX
libzfs_la_LIBADD += \
$(top_builddir)/lib/libshare/libshare.la
endif
libzfs_la_LIBADD += \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la
libzfs_la_LIBADD += -lm $(LIBCRYPTO_LIBS) $(ZLIB_LIBS)
libzfs_la_LDFLAGS = -pthread
if BUILD_FREEBSD
libzfs_la_LIBADD += -lutil -lgeom
libzfs_la_LDFLAGS = -version-info 4:0:0
libzfs_la_LDFLAGS += -version-info 4:0:0
else
libzfs_la_LDFLAGS = -version-info 2:0:0
libzfs_la_LDFLAGS += -version-info 2:0:0
endif
libzfs_la_LIBADD += -lm $(LIBSSL)
# Licensing data
EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip
lib/libzfs/libzfs.pc.in
+2
View File
@@ -8,5 +8,7 @@ Description: LibZFS library
Version: @VERSION@
URL: https://zfsonlinux.org
Requires: libzfs_core
Requires.private: libcrypto zlib
Cflags: -I${includedir}/libzfs -I${includedir}/libspl
Libs: -L${libdir} -lzfs -lnvpair
Libs.private: -luutil -lm -pthread
lib/libzfs_core/.gitignore
+1
View File
@@ -0,0 +1 @@
/libzfs_core.pc
lib/libzfs_core/Makefile.am
+8 -5
View File
@@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am
pkgconfig_DATA = libzfs_core.pc
lib_LTLIBRARIES = libzfs_core.la
USER_C = \
@@ -8,13 +10,14 @@ USER_C = \
libzfs_core_la_SOURCES = $(USER_C)
libzfs_core_la_LIBADD = \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzutil/libzutil.la
$(top_builddir)/lib/libzutil/libzutil.la \
$(top_builddir)/lib/libnvpair/libnvpair.la
libzfs_core_la_LDFLAGS = -pthread
if BUILD_FREEBSD
libzfs_core_la_LDFLAGS = -version-info 3:0:0
libzfs_core_la_LIBADD += -lutil -lgeom
libzfs_core_la_LDFLAGS += -version-info 3:0:0
else
libzfs_core_la_LDFLAGS = -version-info 1:0:0
libzfs_core_la_LDFLAGS += -version-info 1:0:0
endif
lib/libzfs/libzfs_core.pc.in → lib/libzfs_core/libzfs_core.pc.in
+3 -1
View File
@@ -7,5 +7,7 @@ Name: libzfs_core
Description: LibZFS core library
Version: @VERSION@
URL: https://zfsonlinux.org
Requires.private: blkid uuid libtirpc zlib
Cflags: -I${includedir}/libzfs -I${includedir}/libspl
Libs: -L${libdir} -lzfs_core
Libs: -L${libdir} -lzfs_core -lnvpair
Libs.private: @LIBCLOCK_GETTIME@ @LIBUDEV_LIBS@ -lm -pthread
lib/libzpool/Makefile.am
+11 -6
View File
@@ -13,6 +13,8 @@ AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
# Includes kernel code generate warnings for large stack frames
AM_CFLAGS += $(FRAME_LARGER_THAN)
AM_CFLAGS += $(ZLIB_CFLAGS)
AM_CFLAGS += -DLIB_ZPOOL_BUILD
lib_LTLIBRARIES = libzpool.la
@@ -199,16 +201,19 @@ nodist_libzpool_la_SOURCES = \
libzpool_la_LIBADD = \
$(top_builddir)/lib/libicp/libicp.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libzutil/libzutil.la
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
$(top_builddir)/lib/libnvpair/libnvpair.la
libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -ldl
libzpool_la_LDFLAGS = -pthread
if BUILD_FREEBSD
libzpool_la_LIBADD += $(ZLIB) -ldl -lgeom
libzpool_la_LDFLAGS = -pthread -version-info 4:0:0
libzpool_la_LIBADD += -lgeom
libzpool_la_LDFLAGS += -version-info 4:0:0
else
libzpool_la_LIBADD += $(ZLIB) -ldl
libzpool_la_LDFLAGS = -pthread -version-info 2:0:0
libzpool_la_LDFLAGS += -version-info 2:0:0
endif
if TARGET_CPU_POWERPC
lib/libzutil/Makefile.am
+4 -2
View File
@@ -2,6 +2,7 @@ include $(top_srcdir)/config/Rules.am
# Suppress unused but set variable warnings often due to ASSERTs
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUDEV_CFLAGS)
DEFAULT_INCLUDES += -I$(srcdir)
@@ -32,11 +33,12 @@ libzutil_la_SOURCES = $(USER_C)
libzutil_la_LIBADD = \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libtpool/libtpool.la
$(top_builddir)/lib/libtpool/libtpool.la \
$(top_builddir)/lib/libspl/libspl.la
if BUILD_LINUX
libzutil_la_LIBADD += \
$(top_builddir)/lib/libefi/libefi.la
endif
libzutil_la_LIBADD += -lm $(LIBBLKID) $(LIBUDEV)
libzutil_la_LIBADD += -lm $(LIBBLKID_LIBS) $(LIBUDEV_LIBS)