From 539defc873dd1b53d7fc483947e56cbfaeebeee8 Mon Sep 17 00:00:00 2001 From: Maximilian Mehnert Date: Sun, 17 Nov 2013 11:47:50 +0100 Subject: [PATCH] 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 Closes #1841 --- cmd/mount_zfs/Makefile.am | 3 ++- cmd/zdb/Makefile.am | 3 ++- cmd/zhack/Makefile.am | 3 ++- cmd/zinject/Makefile.am | 3 ++- cmd/zpool/Makefile.am | 3 ++- cmd/zstreamdump/Makefile.am | 3 ++- cmd/ztest/Makefile.am | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am index 74524f031..fe34c96b7 100644 --- 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 49dbf50bc..854fbab26 100644 --- 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 944e64257..922aef971 100644 --- 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 f53956911..4adef11ba 100644 --- 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 e7d31c60c..8124f0093 100644 --- 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 175874ffa..d6c64f512 100644 --- 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 403b858c4..a3cd83496 100644 --- 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 -- 2.40.0