d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing libspl+libzpool libs to libzfs

Browse Source 
The libspl and libzpool libraries were missing from the libzfs
Makefile.am.  They should be explicitly listed to avoid build
issues when compiling static libraries and binaries.

Additionally, ensure libzpool is built before libzfs because
libzfs is dependent on libzpool.  This was also exposed as an
issue when forcing static linking.
This commit is contained in:
Brian Behlendorf 2011-03-03 15:45:28 -08:00
parent 6742abf9ec
commit 5075c7ea69
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzfs libzpool SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzpool libzfs

2
lib/Makefile.in
View File

@ -292,7 +292,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzfs libzpool SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzpool libzfs
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:

4
lib/libzfs/Makefile.am
View File

@ -9,8 +9,10 @@ lib_LTLIBRARIES = libzfs.la
libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX) libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX)
libzfs_la_LIBADD = \ libzfs_la_LIBADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libuutil/libuutil.la $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la
libzfs_la_SOURCES = \ libzfs_la_SOURCES = \
$(top_srcdir)/lib/libzfs/libzfs_changelist.c \ $(top_srcdir)/lib/libzfs/libzfs_changelist.c \

10
lib/libzfs/Makefile.in
View File

@ -103,8 +103,10 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libefi/libefi.la \ libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libuutil/libuutil.la $(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la
am_libzfs_la_OBJECTS = libzfs_changelist.lo libzfs_config.lo \ am_libzfs_la_OBJECTS = libzfs_changelist.lo libzfs_config.lo \
libzfs_dataset.lo libzfs_diff.lo libzfs_fru.lo libzfs_graph.lo \ libzfs_dataset.lo libzfs_diff.lo libzfs_fru.lo libzfs_graph.lo \
libzfs_import.lo libzfs_mount.lo libzfs_pool.lo \ libzfs_import.lo libzfs_mount.lo libzfs_pool.lo \
@ -321,8 +323,10 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
lib_LTLIBRARIES = libzfs.la lib_LTLIBRARIES = libzfs.la
libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX) libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX)
libzfs_la_LIBADD = \ libzfs_la_LIBADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libuutil/libuutil.la $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la
libzfs_la_SOURCES = \ libzfs_la_SOURCES = \
$(top_srcdir)/lib/libzfs/libzfs_changelist.c \ $(top_srcdir)/lib/libzfs/libzfs_changelist.c \