commit: 519fafed4a8220edd03a14094989fc2ee07df30f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 21:49:27 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 13 22:47:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519fafed
waf-utils.eclass: Simplify output of configure command and arguments
We can just assign these to an array and echo before executing. Using
@Q makes Bash quote the output. This only works in Bash 4.4 and later
but on earlier versions, it simply doesn't quote.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
eclass/waf-utils.eclass | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 878068fc9f4..dc21baafc9d 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: waf-utils.eclass
@@ -84,13 +84,19 @@ waf-utils_src_configure() {
[[ -z ${NO_WAF_LIBDIR} ]] &&
libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)")
tc-export AR CC CPP CXX RANLIB
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\"
\"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir[@]} $@ configure"
- CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
- "--prefix=${EPREFIX}/usr" \
- "${libdir[@]}" \
- "${@}" \
- configure || die "configure failed"
+ local CMD=(
+ CCFLAGS="${CFLAGS}"
+ LINKFLAGS="${CFLAGS} ${LDFLAGS}"
+ "${WAF_BINARY}"
+ "--prefix=${EPREFIX}/usr"
+ "${libdir[@]}"
+ "${@}"
+ configure
+ )
+
+ echo "${CMD[@]@Q}" >&2
+ env "${CMD[@]}" || die "configure failed"
}
# @FUNCTION: waf-utils_src_compile
