From 16e7179f7557aff5a6b2ff8f79c0b2aab425c43f Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Thu, 23 Jun 2022 00:32:43 -0700 Subject: [PATCH] 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: 8b3f2a030d2af15938faea816c73e3d04fe0ff33 Test-Parameters: trivial Fixes: a5084c2f2e ("LU-14937 build: re-use config cache in 'make rpms/debs'") Signed-off-by: Shaun Tancheff Change-Id: I986c2ae3653deae08b9da8d64d0b3c02fdc8fa2b Reviewed-by: Petros Koutoupis Reviewed-by: Sebastien Buisson Reviewed-on: https://review.whamcloud.com/47711 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- debian/rules | 10 ++++++++-- lustre.spec.in | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index df80c07..df8bcd8 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 be66083..baf34bc 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -462,7 +462,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 -- 1.8.3.1