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

Combine libraries: spl, avl, efi, share, unicode.

Browse Source 
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:
Darik Horn
2011-12-31 17:30:52 -06:00
committed by Brian Behlendorf
parent 57a4eddc4d
commit 750562833f
32 changed files with 154 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libzpool/Makefile.am
+5 -6
View File
@@ -8,11 +8,6 @@ DEFAULT_INCLUDES += \
lib_LTLIBRARIES = libzpool.la
libzpool_la_LIBADD = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la
libzpool_la_SOURCES = \
$(top_srcdir)/lib/libzpool/kernel.c \
$(top_srcdir)/lib/libzpool/taskq.c \
@@ -93,7 +88,11 @@ libzpool_la_SOURCES = \
$(top_srcdir)/module/zfs/zle.c \
$(top_srcdir)/module/zfs/zrlock.c
libzpool_la_LDFLAGS = -pthread -version-info 1:0:0
libzpool_la_LIBADD = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la
libzpool_la_LDFLAGS = -pthread -version-info 1:1:0
EXTRA_DIST = \
$(top_srcdir)/module/zfs/vdev_disk.c \
lib/libzpool/Makefile.in
+6 -8
View File
@@ -117,8 +117,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libzpool_la_DEPENDENCIES = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la
$(top_builddir)/lib/libuutil/libuutil.la
am_libzpool_la_OBJECTS = kernel.lo taskq.lo util.lo zfs_comutil.lo \
zfs_deleg.lo zfs_fletcher.lo zfs_namecheck.lo zfs_prop.lo \
zfs_uio.lo zpool_prop.lo zprop_common.lo arc.lo bplist.lo \
@@ -358,11 +357,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
$(FRAME_LARGER_THAN)
lib_LTLIBRARIES = libzpool.la
libzpool_la_LIBADD = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la
libzpool_la_SOURCES = \
$(top_srcdir)/lib/libzpool/kernel.c \
$(top_srcdir)/lib/libzpool/taskq.c \
@@ -443,7 +437,11 @@ libzpool_la_SOURCES = \
$(top_srcdir)/module/zfs/zle.c \
$(top_srcdir)/module/zfs/zrlock.c
libzpool_la_LDFLAGS = -pthread -version-info 1:0:0
libzpool_la_LIBADD = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la
libzpool_la_LDFLAGS = -pthread -version-info 1:1:0
EXTRA_DIST = \
$(top_srcdir)/module/zfs/vdev_disk.c \
$(top_srcdir)/module/zfs/zfs_acl.c \