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/libuutil/Makefile.am
+6 -3
View File
@@ -8,8 +8,6 @@ DEFAULT_INCLUDES += \
lib_LTLIBRARIES = libuutil.la
libuutil_la_LIBADD = $(top_builddir)/lib/libavl/libavl.la
libuutil_la_SOURCES = \
$(top_srcdir)/lib/libuutil/uu_alloc.c \
$(top_srcdir)/lib/libuutil/uu_avl.c \
@@ -22,4 +20,9 @@ libuutil_la_SOURCES = \
$(top_srcdir)/lib/libuutil/uu_string.c \
$(top_srcdir)/lib/libuutil/uu_strtoint.c
libuutil_la_LDFLAGS = -version-info 1:0:0
libuutil_la_LIBADD = \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la
libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
lib/libuutil/Makefile.in
+9 -3
View File
@@ -115,7 +115,9 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libuutil_la_DEPENDENCIES = $(top_builddir)/lib/libavl/libavl.la
libuutil_la_DEPENDENCIES = $(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la
am_libuutil_la_OBJECTS = uu_alloc.lo uu_avl.lo uu_dprintf.lo \
uu_ident.lo uu_list.lo uu_misc.lo uu_open.lo uu_pname.lo \
uu_string.lo uu_strtoint.lo
@@ -342,7 +344,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
$(FRAME_LARGER_THAN)
lib_LTLIBRARIES = libuutil.la
libuutil_la_LIBADD = $(top_builddir)/lib/libavl/libavl.la
libuutil_la_SOURCES = \
$(top_srcdir)/lib/libuutil/uu_alloc.c \
$(top_srcdir)/lib/libuutil/uu_avl.c \
@@ -355,7 +356,12 @@ libuutil_la_SOURCES = \
$(top_srcdir)/lib/libuutil/uu_string.c \
$(top_srcdir)/lib/libuutil/uu_strtoint.c
libuutil_la_LDFLAGS = -version-info 1:0:0
libuutil_la_LIBADD = \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la
libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
all: all-am
.SUFFIXES: