From: Mr NeilBrown Date: Wed, 5 Aug 2020 03:14:27 +0000 (+1000) Subject: LU-13902 config: add test for /usr/include/libiberty/ X-Git-Tag: 2.13.56~31 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e5923357b4ec5177e8cc540c5603f0f9df41de1e LU-13902 config: add test for /usr/include/libiberty/ The Makefile currently assumes that -I/usr/include/libiberty is only needed on UBUNTU. But UBUNTU is only evaludate if modules are being built (it is based on the base kernel found). So with --disable-modules, -I/usr/include/liberty is never selected. There is no need for this indirection. It is easy to check if /usr/inclue/libiberty exists, and to use if it if does. So do that. Signed-off-by: Mr NeilBrown Change-Id: I6fb482256df3c7ce537dd4d451a9da27b8d8d3ea Reviewed-on: https://review.whamcloud.com/39749 Tested-by: jenkins Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index a4abb21..ad23218 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -440,6 +440,7 @@ AM_CONDITIONAL([RHEL], [test -f /etc/redhat-release]) AM_CONDITIONAL([SUSE], [test -f /etc/SUSE-brand -o -f /etc/SuSE-release]) AM_CONDITIONAL([UBUNTU], [test x$UBUNTU_KERNEL = xyes]) AM_CONDITIONAL([BUILD_LUTF], [test x$enable_lutf = xyes]) +AM_CONDITIONAL([LIBIBERTY_SUBDIR], [test -d /usr/include/libiberty]) LN_CONDITIONALS LC_CONDITIONALS diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index ecc1d25..c642e16 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -116,7 +116,7 @@ check_fallocate_LDADD = $(LIBLUSTREAPI) if LIBAIO aiocp_LDADD= -laio endif -if UBUNTU +if LIBIBERTY_SUBDIR statx_CPPFLAGS := -I/usr/include/libiberty endif statx_LDADD = $(SELINUX) -liberty