Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Let libnvpair be linked independently of libzfs. 

Autoconf will fail to detect the ZoL libnvpair on systems that do not
implicitly link library runtime dependencies, which is anything that
has the GCC 4.5 DCO update.

Build libuutil before libnvpair, and put it on the the LDADD line of
the libnvpair automake template.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes: #560
This commit is contained in:
Darik Horn 2012-02-04 20:54:43 -06:00 committed by Brian Behlendorf
parent 47621f3d76
commit e67329d8e0
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@ -4,4 +4,4 @@ SUBDIRS = libspl libavl libefi libshare libunicode
# These four libraries, which are installed as the final build product, # These four libraries, which are installed as the final build product,
# incorporate the five convenience libraries given above. # incorporate the five convenience libraries given above.
SUBDIRS += libnvpair libuutil libzpool libzfs SUBDIRS += libuutil libnvpair libzpool libzfs

2
lib/Makefile.in
View File

@ -322,7 +322,7 @@ udevruledir = @udevruledir@
# These four libraries, which are installed as the final build product, # These four libraries, which are installed as the final build product,
# incorporate the five convenience libraries given above. # incorporate the five convenience libraries given above.
SUBDIRS = libspl libavl libefi libshare libunicode libnvpair libuutil \ SUBDIRS = libspl libavl libefi libshare libunicode libuutil libnvpair \
libzpool libzfs libzpool libzfs
all: all-recursive all: all-recursive

3
lib/libnvpair/Makefile.am
View File

@ -14,6 +14,9 @@ libnvpair_la_SOURCES = \
$(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \ $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
$(top_srcdir)/module/nvpair/nvpair.c $(top_srcdir)/module/nvpair/nvpair.c
libnvpair_la_LIBADD = \
$(top_builddir)/lib/libuutil/libuutil.la
libnvpair_la_LDFLAGS = -version-info 1:1:0 libnvpair_la_LDFLAGS = -version-info 1:1:0
EXTRA_DIST = \ EXTRA_DIST = \

5
lib/libnvpair/Makefile.in
View File

@ -116,7 +116,7 @@ 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)
libnvpair_la_LIBADD = libnvpair_la_DEPENDENCIES = $(top_builddir)/lib/libuutil/libuutil.la
am_libnvpair_la_OBJECTS = libnvpair.lo nvpair_alloc_system.lo \ am_libnvpair_la_OBJECTS = libnvpair.lo nvpair_alloc_system.lo \
nvpair_alloc_fixed.lo nvpair.lo nvpair_alloc_fixed.lo nvpair.lo
libnvpair_la_OBJECTS = $(am_libnvpair_la_OBJECTS) libnvpair_la_OBJECTS = $(am_libnvpair_la_OBJECTS)
@ -348,6 +348,9 @@ libnvpair_la_SOURCES = \
$(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \ $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
$(top_srcdir)/module/nvpair/nvpair.c $(top_srcdir)/module/nvpair/nvpair.c
libnvpair_la_LIBADD = \
$(top_builddir)/lib/libuutil/libuutil.la
libnvpair_la_LDFLAGS = -version-info 1:1:0 libnvpair_la_LDFLAGS = -version-info 1:1:0
EXTRA_DIST = \ EXTRA_DIST = \
$(top_srcdir)/module/nvpair/nvpair_alloc_spl.c $(top_srcdir)/module/nvpair/nvpair_alloc_spl.c