From: Shaun Tancheff <shaun.tancheff@hpe.com>
Date: Sun, 20 Feb 2022 17:49:39 +0000 (-0500)
Subject: LU-15573 build: remove mpi, CC deps from config cache
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=497cea4815a3e08f3ffd88ecba0c129a9e9ca5b8;p=fs%2Flustre-release.git

LU-15573 build: remove mpi, CC deps from config cache

Also drop mpi and CC dependencies compiler type from the
initial values in the configure cache as these may be
changed during the setup in the rpm spec or debian build rules

Test-Parameters: trivial
Fixes: a5084c2f2e ("LU-14937 build: re-use config cache in 'make rpms/debs'")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I986c2ae3653deae08b9da8d64d0b3c02fdc8fa2b
---

diff --git a/debian/rules b/debian/rules
index 30e8016..c3e227e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -203,7 +203,10 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	# and create dedicated cache in temporary build directory
 	if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
 		export TMP_CACHE_FILE=$$(mktemp); \
-		sed "/ac_cv_env/d" "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
+		sed -e "/ac_cv_env/d" \
+		    -e "/am_cv_CC_dependencies_compiler_type/d" \
+		    -e "/lb_cv_mpi_tests/d" \
+		       "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
 	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
@@ -497,7 +500,10 @@ kdist_config: prep-deb-files patch-stamp
 	# and create dedicated cache in temporary build directory
 	if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
 		export TMP_CACHE_FILE=$$(mktemp --tmpdir newconfig-XXXXXXXX.cache); \
-		sed "/ac_cv_env/d" "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
+		sed -e "/ac_cv_env/d" \
+		    -e "/am_cv_CC_dependencies_compiler_type/d" \
+		    -e "/lb_cv_mpi_tests/d" \
+		       "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
 	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
diff --git a/lustre.spec.in b/lustre.spec.in
index 1995358..7d3288f 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -457,7 +457,10 @@ if [ -n "$CONFIGURE_ARGS" ]; then
 	# and create dedicated cache in temporary build directory
 	if [ -f "$CONFIG_CACHE_FILE" ]; then
 		TMP_CONFIG_CACHE="$(mktemp --tmpdir newconfig-XXXXXXXX.cache)"
-		sed "/ac_cv_env/d" "$CONFIG_CACHE_FILE" > $TMP_CONFIG_CACHE
+		sed -e "/ac_cv_env/d" \
+		    -e "/am_cv_CC_dependencies_compiler_type/d" \
+		    -e "/lb_cv_mpi_tests/d" \
+		       "$CONFIG_CACHE_FILE" > $TMP_CONFIG_CACHE
 		CONFIGURE_ARGS="$CONFIGURE_ARGS --cache-file=$TMP_CONFIG_CACHE"
 	fi
 fi