From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Feb 2013 16:47:41 +0000 (-0800)
Subject: EXTRA_ECONF: support quoted args, bug #457136
X-Git-Tag: v2.2.0_alpha164~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e62aa344cba45aca2f317ecaae025ed4240659fd;p=portage.git

EXTRA_ECONF: support quoted args, bug #457136
---

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index ac1c07617..4812db343 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -494,6 +494,9 @@ econf() {
 			set -- --libdir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_LIBDIR}")" "$@"
 		fi
 
+		# Handle arguments containing quoted whitespace (see bug #457136).
+		eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
 		set -- \
 			--prefix="${EPREFIX}"/usr \
 			${CBUILD:+--build=${CBUILD}} \
@@ -505,7 +508,7 @@ econf() {
 			--sysconfdir="${EPREFIX}"/etc \
 			--localstatedir="${EPREFIX}"/var/lib \
 			"$@" \
-			${EXTRA_ECONF}
+			"${EXTRA_ECONF[@]}"
 		__vecho "${ECONF_SOURCE}/configure" "$@"
 
 		if ! "${ECONF_SOURCE}/configure" "$@" ; then