LU-15122 osd-ldiskfs: Fix ASSERTION( iobuf->dr_rw == 0 ) with 64KB PAGE_SIZE

[fs/lustre-release.git] / config / lustre-build.m4

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 81e7644..a643fc0 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -148,7 +148,7 @@ AC_MSG_CHECKING([whether to build Linux kernel modules])
 AC_ARG_ENABLE([modules],
        AC_HELP_STRING([--disable-modules],
                [disable building of Lustre kernel modules]),
-       [], [
+       [ AC_DEFINE(HAVE_NATIVE_LINUX_CLIENT, 1, [support native Linux client])], [
                LC_TARGET_SUPPORTED([enable_modules="yes"],
                                    [enable_modules="no"])
        ])
@@ -344,8 +344,10 @@ AS_IF([test $target_cpu = powerpc64], [
        CC="$CC -m64"
 ])
 
-# libcfs/include for util headers, lnetconfig headers, lustre/include for liblustreapi and friends
-CPPFLAGS="-I$PWD/libcfs/include -I$PWD/lnet/utils -I$PWD/lustre/include $CPPFLAGS"
+# libcfs/include for util headers, lustre/include for liblustreapi and friends
+# UAPI headers from OpenSFS are included if modules support is enabled, otherwise
+# it will use the native kernel implementation.
+CPPFLAGS="-I$PWD/libcfs/include -I$PWD/lnet/utils/ -I$PWD/lustre/include $CPPFLAGS"
 
 CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(CCASFLAGS)
@@ -386,7 +388,7 @@ AC_DEFUN([LB_CC_NO_STRINGOP_TRUNCATION], [
        AC_MSG_CHECKING([for -Wno-stringop-truncation support])
 
        saved_flags="$CFLAGS"
-       CFLAGS="$CFLAGS -Wno-stringop-truncation"
+       CFLAGS="$CFLAGS -Werror -Wno-stringop-truncation"
 
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-stringop-truncation"
@@ -460,6 +462,7 @@ AC_DEFUN([LB_CONFIG_FILES], [
                AC_PACKAGE_TARNAME[-dkms.spec]
                ldiskfs/Makefile
                ldiskfs/autoMakefile
+               lustre/utils/lustre.pc
                lustre-iokit/Makefile
                lustre-iokit/obdfilter-survey/Makefile
                lustre-iokit/ost-survey/Makefile
@@ -625,6 +628,19 @@ AC_SUBST(RPMBUILD_BINARY_ARGS)
 ]) # LB_CONFIG_RPMBUILD_OPTIONS
 
 #
+# LB_CONFIG_CACHE_OPTIONS
+#
+# Propagate config cache option
+#
+AC_DEFUN([LB_CONFIG_CACHE_OPTIONS], [
+CONFIG_CACHE_FILE=
+if test -f "$cache_file"; then
+       CONFIG_CACHE_FILE=$(readlink --canonicalize "$cache_file")
+fi
+AC_SUBST(CONFIG_CACHE_FILE)
+]) # LB_CONFIG_CACHE_OPTIONS
+
+#
 # LB_CONFIGURE
 #
 # main configure steps
@@ -662,6 +678,18 @@ LC_CONFIG_CRYPTO
 # Tests depends from utils (multiop from liblustreapi)
 AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
 
+AS_IF([test "x$enable_utils" = xyes], [
+       LC_GLIBC_SUPPORT_COPY_FILE_RANGE
+       LC_OPENSSL_SSK
+       LC_OPENSSL_GETSEPOL
+       LC_FID2PATH_ANON_UNION
+       LC_IOC_REMOVE_ENTRY
+])
+AS_IF([test "x$enable_tests" = xyes], [
+       LC_HAVE_LIBAIO
+       LC_GLIBC_SUPPORT_FHANDLES
+])
+
 LIBCFS_CONFIG_CDEBUG
 LC_QUOTA
 
@@ -691,6 +719,7 @@ MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.* Modules.symver
 AC_SUBST(MOSTLYCLEANFILES)
 
 LB_CONFIG_RPMBUILD_OPTIONS
+LB_CONFIG_CACHE_OPTIONS
 
 AC_OUTPUT