From: John L. Hammond <john.hammond@intel.com>
Date: Fri, 19 Jan 2018 21:37:27 +0000 (-0600)
Subject: LU-10536 build: add -lnvpair to ZFS LDFLAGS
X-Git-Tag: 2.10.58~33
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=eabd5d7d7ee450698f1ff6ae20bf1072cae9c89c;p=fs%2Flustre-release.git

LU-10536 build: add -lnvpair to ZFS LDFLAGS

The ZFS mount utils plugin directly depends on libnvpair so add
-lnvpair to the relevant LDFLAGS. This makes building with
--disable-shared succeed.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Ie7d7043b011dab3e139786ed8fffb09e1078a34b
Reviewed-on: https://review.whamcloud.com/30947
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index 297e790..34f29fc 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -336,7 +336,7 @@ AC_DEFUN([LB_ZFS_USER], [
 	AC_MSG_RESULT([$zfsinc])
 
 	ZFS_LIBZFS_INCLUDE=${zfsinc}
-	ZFS_LIBZFS_LDFLAGS="-lzfs ${zfslib}"
+	ZFS_LIBZFS_LDFLAGS="-lzfs -lnvpair ${zfslib}"
 	AC_SUBST(ZFS_LIBZFS_INCLUDE)
 	AC_SUBST(ZFS_LIBZFS_LDFLAGS)
 ])