Whamcloud - gitweb
LU-15908 build: fix debian rules 12/47512/1
authorSebastien Buisson <sbuisson@ddn.com>
Thu, 2 Jun 2022 10:05:02 +0000 (12:05 +0200)
committerSebastien Buisson <sbuisson@ddn.com>
Thu, 2 Jun 2022 10:09:10 +0000 (12:09 +0200)
A comment in debian/rules file breaks a commands-line continuation,
causing exported env vars to be dropped.

Fixes: a5084c2f2e ("LU-14937 build: re-use config cache in 'make rpms/debs'")
Test-Parameters: trivial
Signed-off-by: Ake Sandgren <ake.sandgren@hpc2n.umu.se>
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I0894199301c489b1961e043651c74d7c6c0089d2

debian/rules

index df80c07..3b2a478 100755 (executable)
@@ -199,8 +199,6 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
        elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nocrypto"; then \
                export EXTRAFLAGS="$${EXTRAFLAGS} --disable-crypto"; \
        fi; \
-       # remove env variables from config cache built by initial configure,
-       # 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}; \
@@ -493,8 +491,6 @@ kdist_config: prep-deb-files patch-stamp
        elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nocrypto"; then \
                export EXTRAFLAGS="$${EXTRAFLAGS} --disable-crypto"; \
        fi; \
-       # remove env variables from config cache built by initial configure,
-       # 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}; \