LU-15026 zfs: Fix ZFS(2.0.0-1) build error on CentOS (3.10)

ZFS: (2.0.0-1)
Lustre: 608cce73d51 LU-15007 tests: quota enable cmd fix
CentOS: 3.10.0-1160.15.2.el7.x86_64

This patch fixes two build failures seens as below for
the above configuration

First
~~~~~
In file included from:
/root/zfs/zfs_git_lustre_build/zfs/include/sys/spa.h:39:0,
	from libmount_utils_zfs.c:32:
	/root/zfs/<path>/.../sys/zfs_context.h:110:27:
	fatal error: sys/byteorder.h: No such file or directory
	#include <sys/byteorder.h>

Second
~~~~~~
gcc -rdynamic -shared -export-dynamic -pthread \
	-L/root/zfs/zfs_git_lustre_build/zfs/lib/libzfs/.libs/
	-L/root/zfs/zfs_git_lustre_build/zfs/lib/libnvpair/.libs
	-o mount_osd_zfs.so \
	`ar -t libmount_utils_zfs.a` \
	-ldl -lzfs -lnvpair -lzpool
	/usr/bin/ld: cannot find -lzpool
	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	collect2: error: ld returned 1 exit status

Lustre-change: https://review.whamcloud.com/45016
Lustre-commit: 8931f7e4e5da39389a79eff11dc04bb468beb715

Change-Id: Iaf868391e414deb7ac8df43847250bbcd0115d5e
Test-Parameters: trivial fstype=zfs
Signed-off-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45355
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index 80dfcff..e350c77 100644 (file)
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -322,8 +322,8 @@ AC_DEFUN([LB_ZFS_USER], [
        AC_MSG_CHECKING([zfs devel headers])
        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/ -L$zfssrc/lib/libnvpair/.libs"
+                       zfsinc="-I $zfssrc/lib/libspl/include -I $zfssrc/lib/libspl/include/os/linux -I $zfssrc/include"
+                       zfslib="-L$zfssrc/lib/libzfs/.libs/ -L$zfssrc/lib/libnvpair/.libs/ -L$zfssrc/lib/libzpool/.libs/"
                ], [test -d /usr/include/libzfs && test -d /usr/include/libspl], [
                        zfsinc="-I/usr/include/libspl -I /usr/include/libzfs"
                        zfslib=""