From: Arshad Hussain Date: Wed, 22 Sep 2021 11:01:10 +0000 (-0400) Subject: LU-15026 zfs: Fix ZFS(2.0.0-1) build error on CentOS (3.10) X-Git-Tag: 2.14.56~173 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F45016%2F2;p=fs%2Flustre-release.git 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//.../sys/zfs_context.h:110:27: fatal error: sys/byteorder.h: No such file or directory #include 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 Test-Parameters: trivial fstype=zfs Signed-off-by: Arshad Hussain Change-Id: I5be8cc846da1ca213f1bd3c29b6b55acc22928f2 Reviewed-on: https://review.whamcloud.com/45016 Tested-by: jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4 index 5a83455..27b0c0f 100644 --- a/config/lustre-build-zfs.m4 +++ b/config/lustre-build-zfs.m4 @@ -328,8 +328,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=""