summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarik Horn <[email protected]>2012-02-04 20:54:43 -0600
committerBrian Behlendorf <[email protected]>2012-02-07 11:37:15 -0800
commite67329d8e0befe79016bd3e4d52435552c554a52 (patch)
tree61f33256f36288b75c4535630603296a7a3be38b
parent47621f3d76abf63e178b95a446134565cc553b1a (diff)
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 <[email protected]> Closes: #560
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/libnvpair/Makefile.am3
-rw-r--r--lib/libnvpair/Makefile.in5
4 files changed, 9 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 51a8abd0c..09139d58c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,4 +4,4 @@ SUBDIRS = libspl libavl libefi libshare libunicode
# These four libraries, which are installed as the final build product,
# incorporate the five convenience libraries given above.
-SUBDIRS += libnvpair libuutil libzpool libzfs
+SUBDIRS += libuutil libnvpair libzpool libzfs
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c33683dc9..45180aede 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -322,7 +322,7 @@ udevruledir = @udevruledir@
# These four libraries, which are installed as the final build product,
# 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
all: all-recursive
diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index b0cf8ad23..467f461a3 100644
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -14,6 +14,9 @@ libnvpair_la_SOURCES = \
$(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
$(top_srcdir)/module/nvpair/nvpair.c
+libnvpair_la_LIBADD = \
+ $(top_builddir)/lib/libuutil/libuutil.la
+
libnvpair_la_LDFLAGS = -version-info 1:1:0
EXTRA_DIST = \
diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 8fb993e63..b2e8e22dc 100644
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -116,7 +116,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)"
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 \
nvpair_alloc_fixed.lo nvpair.lo
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.c
+libnvpair_la_LIBADD = \
+ $(top_builddir)/lib/libuutil/libuutil.la
+
libnvpair_la_LDFLAGS = -version-info 1:1:0
EXTRA_DIST = \
$(top_srcdir)/module/nvpair/nvpair_alloc_spl.c