Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-15573 build: remove mpi, CC deps from config cache
[fs/lustre-release.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
df80c07
..
df8bcd8
100755
(executable)
--- 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); \
# 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}"; \
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); \
# 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}"; \
export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
fi; \
echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \