00430d087a
rebase done with import-patchqueue/export-patchqueue Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Debian ZFS on Linux maintainers
|
|
<pkg-zfsonlinux-devel@alioth-lists.debian.net>
|
|
Date: Wed, 30 Jan 2019 15:12:04 +0100
|
|
Subject: [PATCH] Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core
|
|
|
|
---
|
|
lib/libzfs/Makefile.am | 1 +
|
|
lib/libzfs_core/Makefile.am | 3 ++-
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
|
|
index f1260ea71..5b07b9d9d 100644
|
|
--- a/lib/libzfs/Makefile.am
|
|
+++ b/lib/libzfs/Makefile.am
|
|
@@ -31,6 +31,7 @@ nodist_libzfs_la_SOURCES = \
|
|
|
|
libzfs_la_LIBADD = \
|
|
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
|
|
+ $(top_builddir)/lib/libuutil/libuutil.la \
|
|
$(top_builddir)/lib/libshare/libshare.la \
|
|
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
|
$(top_builddir)/lib/libzpool/libzpool.la
|
|
diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
|
|
index 5eafc25c0..10d6de3d6 100644
|
|
--- a/lib/libzfs_core/Makefile.am
|
|
+++ b/lib/libzfs_core/Makefile.am
|
|
@@ -16,7 +16,8 @@ nodist_libzfs_core_la_SOURCES = \
|
|
$(KERNEL_C)
|
|
|
|
libzfs_core_la_LIBADD = \
|
|
- $(top_builddir)/lib/libnvpair/libnvpair.la
|
|
+ $(top_builddir)/lib/libnvpair/libnvpair.la \
|
|
+ $(top_builddir)/lib/libuutil/libuutil.la
|
|
|
|
libzfs_core_la_LDFLAGS = -version-info 1:0:0
|
|
|