mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-26 12:12:13 +03:00
Combine libraries: spl, avl, efi, share, unicode.
These libraries, which are an artifact of the ZoL development process, conflict with packages that are already in distribution: * libspl: SPL Programming Language * libavl: AVL for Linux * libefi: GRUB And these libraries are potential conflicts: * libshare: the Linux Mount Manager * libunicode: Perl and Python Recompose these five ZoL components into the four libraries that are conventionally provided by Solaris and FreeBSD systems: + libnvpair + libuutil + libzpool + libzfs This change resolves the name conflict, makes ZoL more compatible with existing software that uses autotools to detect ZFS, and allows pkg-zfs to better reflect the official Debian kFreeBSD packaging. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes: #430
This commit is contained in:
committed by
Brian Behlendorf
parent
57a4eddc4d
commit
750562833f
@@ -14,11 +14,7 @@ zpool_SOURCES = \
|
||||
$(top_srcdir)/cmd/zpool/zpool_vdev.c
|
||||
|
||||
zpool_LDADD = \
|
||||
$(top_builddir)/lib/libspl/libspl.la \
|
||||
$(top_builddir)/lib/libavl/libavl.la \
|
||||
$(top_builddir)/lib/libefi/libefi.la \
|
||||
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
$(top_builddir)/lib/libunicode/libunicode.la \
|
||||
$(top_builddir)/lib/libuutil/libuutil.la \
|
||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||
$(top_builddir)/lib/libzfs/libzfs.la
|
||||
|
||||
@@ -98,11 +98,7 @@ PROGRAMS = $(sbin_PROGRAMS)
|
||||
am_zpool_OBJECTS = zpool_iter.$(OBJEXT) zpool_main.$(OBJEXT) \
|
||||
zpool_util.$(OBJEXT) zpool_vdev.$(OBJEXT)
|
||||
zpool_OBJECTS = $(am_zpool_OBJECTS)
|
||||
zpool_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
|
||||
$(top_builddir)/lib/libavl/libavl.la \
|
||||
$(top_builddir)/lib/libefi/libefi.la \
|
||||
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
$(top_builddir)/lib/libunicode/libunicode.la \
|
||||
zpool_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
$(top_builddir)/lib/libuutil/libuutil.la \
|
||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||
$(top_builddir)/lib/libzfs/libzfs.la
|
||||
@@ -334,11 +330,7 @@ zpool_SOURCES = \
|
||||
$(top_srcdir)/cmd/zpool/zpool_vdev.c
|
||||
|
||||
zpool_LDADD = \
|
||||
$(top_builddir)/lib/libspl/libspl.la \
|
||||
$(top_builddir)/lib/libavl/libavl.la \
|
||||
$(top_builddir)/lib/libefi/libefi.la \
|
||||
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
$(top_builddir)/lib/libunicode/libunicode.la \
|
||||
$(top_builddir)/lib/libuutil/libuutil.la \
|
||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||
$(top_builddir)/lib/libzfs/libzfs.la
|
||||
|
||||
Reference in New Issue
Block a user