From e6d1968fbbad5971b60e6c09a02d121c31d37d59 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Wed, 5 Aug 2020 12:06:52 +1000 Subject: [PATCH] LU-13903 build: Move GLIBC/openssl checks to where needed. Two config checks on glibs support: LC_GLIBC_SUPPORT_FHANDLES LC_GLIBC_SUPPORT_COPY_FILE_RANGE and two on openssl support: LC_OPENSSL_SSK LC_OPENSSL_GETSEPOL are currently only run when modules are being built. The FHANDLES test is needed when building tests. The COPY_FILE_RANGE test is needed when building utils as are the OPENSSL checks So move the calls to these tests to a more appropriate place, so that ./configure --disable-modules --disable-server can run correctly. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: Id7801112cd53601b3d560119784cbd062bf9610e Reviewed-on: https://review.whamcloud.com/39653 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons --- config/lustre-build.m4 | 6 ++++++ lustre/autoconf/lustre-core.m4 | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 4d089bd..e963320 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -663,8 +663,14 @@ 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 +]) AS_IF([test "x$enable_tests" = xyes], [ LC_HAVE_LIBAIO + LC_GLIBC_SUPPORT_FHANDLES ]) LIBCFS_CONFIG_CDEBUG diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 09e256a..5ccdead 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2359,11 +2359,6 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_CONFIG_FHANDLE LC_CONFIG_GSS - LC_GLIBC_SUPPORT_FHANDLES - LC_GLIBC_SUPPORT_COPY_FILE_RANGE - LC_OPENSSL_SSK - LC_OPENSSL_GETSEPOL - # 3.10 LC_HAVE_PROJECT_QUOTA -- 1.8.3.1