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

Lustre-change: https://review.whamcloud.com/46562
Lustre-commit: TBD (from 497cea4815a3e08f3ffd88ecba0c129a9e9ca5b8)

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
Reviewed-on: https://review.whamcloud.com/47536
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/debian/rules b/debian/rules
index 1b7a113..fc87b9d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -201,7 +201,10 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
        fi; \
        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}"; \
@@ -493,7 +496,10 @@ kdist_config: prep-deb-files patch-stamp
        fi; \
        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 242dcec..c1c3f80 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -639,7 +639,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