From: James Simmons <uja.ornl@yahoo.com>
Date: Thu, 1 Feb 2018 19:37:06 +0000 (-0500)
Subject: LU-10536 build: add path for libnvpair to zfslib
X-Git-Tag: 2.10.59~127
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=45ad1a73829763f9a0ebe0f2c6f25d254697f0e6;p=fs%2Flustre-release.git

LU-10536 build: add path for libnvpair to zfslib

For the case of building lustre against the ZFS source tree
instead of an ZFS installation on the node we need to add
the path $zfssrc/lib/libnvpair/.libs so mount.lustre can
link to the library.

Test-Parameters: trivial

Change-Id: Id08cc3aed1bc201611fb9382d2f53e40e69f9544
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/31128
Tested-by: Jenkins
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.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 f036d46..07f00dc 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -323,7 +323,7 @@ AC_DEFUN([LB_ZFS_USER], [
 	AS_IF([test -z "${zfsinc}"], [
         	AS_IF([test -e "${zfssrc}/include/libzfs.h" && test -e "${zfssrc}/lib/libspl/include"], [
                 	zfsinc="-I $zfssrc/lib/libspl/include -I $zfssrc/include"
-			zfslib="-L$zfssrc/lib/libzfs/.libs/"
+			zfslib="-L$zfssrc/lib/libzfs/.libs/ -L$zfssrc/lib/libnvpair/.libs"
 		], [test -d /usr/include/libzfs && test -d /usr/include/libspl], [
 			zfsinc="-I/usr/include/libspl -I /usr/include/libzfs"
 			zfslib=""