Add missing libzfs_core to Makefiles

On some platforms symbols provided by libzfs_core and used by
libzfs were not available to the linker.  To avoid this issue
libzfs_core has been added to the list of required libraries
when building utilities which depend on libzfs.  This should
have been handled properly by libtool and it's still not
entirely clear why it wasn't on all platforms.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1841

diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am
index 74524f031a8552e5fb750307656f86c3b7c4d466..fe34c96b761877e4db48de248e01e96d0913f9bb 100644 (file)
--- a/cmd/mount_zfs/Makefile.am
+++ b/cmd/mount_zfs/Makefile.am
@@ -18,6 +18,7 @@ mount_zfs_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la
 
 mount_zfs_LDADD += $(LIBSELINUX)

diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am
index 49dbf50bcdeb5edb6566a93589c0ed1ce8c0a651..854fbab26268c802a8496292c6e2617d5ea9ea51 100644 (file)
--- a/cmd/zdb/Makefile.am
+++ b/cmd/zdb/Makefile.am
@@ -14,6 +14,7 @@ zdb_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la
 
 zdb_LDADD += $(ZLIB)

diff --git a/cmd/zhack/Makefile.am b/cmd/zhack/Makefile.am
index 944e6425743e7c3f82e1f7a42f7bb29863f3dc3c..922aef97142636bfa976d814d391282c8d0e1854 100644 (file)
--- a/cmd/zhack/Makefile.am
+++ b/cmd/zhack/Makefile.am
@@ -13,6 +13,7 @@ zhack_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la
 
 zhack_LDADD += $(ZLIB)

diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
index f539569111f1602f86317d22e950cd21a78dc125..4adef11baaf6d51fde76028eba3684ba761128a3 100644 (file)
--- a/cmd/zinject/Makefile.am
+++ b/cmd/zinject/Makefile.am
@@ -15,4 +15,5 @@ zinject_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la

diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
index e7d31c60c9f5cef0c6764aabbd63b72ccef8c986..8124f0093b997704c0760172a319a339cd6d8a6a 100644 (file)
--- a/cmd/zpool/Makefile.am
+++ b/cmd/zpool/Makefile.am
@@ -17,4 +17,5 @@ zpool_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la

diff --git a/cmd/zstreamdump/Makefile.am b/cmd/zstreamdump/Makefile.am
index 175874ffac237c633918339eaa1ea153d9718021..d6c64f5126edd22f622fc4b1d0b329ff6ddd9a51 100644 (file)
--- a/cmd/zstreamdump/Makefile.am
+++ b/cmd/zstreamdump/Makefile.am
@@ -13,6 +13,7 @@ zstreamdump_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la
 
 zstreamdump_LDADD += $(ZLIB)

diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am
index 403b858c479aff72c474d2512428c944aa57d2ce..a3cd83496f2848bd15cce8dddba953074eaa1154 100644 (file)
--- a/cmd/ztest/Makefile.am
+++ b/cmd/ztest/Makefile.am
@@ -15,6 +15,7 @@ ztest_LDADD = \
        $(top_builddir)/lib/libnvpair/libnvpair.la \
        $(top_builddir)/lib/libuutil/libuutil.la \
        $(top_builddir)/lib/libzpool/libzpool.la \
-       $(top_builddir)/lib/libzfs/libzfs.la
+       $(top_builddir)/lib/libzfs/libzfs.la \
+       $(top_builddir)/lib/libzfs_core/libzfs_core.la
 
 ztest_LDADD += -lm -ldl