From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CA2671387FD for ; Thu, 11 Sep 2014 23:45:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C16AE091F; Thu, 11 Sep 2014 23:45:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06AB8E091F for ; Thu, 11 Sep 2014 23:45:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19B1C33FDA2 for ; Thu, 11 Sep 2014 23:45:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C473253FE for ; Thu, 11 Sep 2014 23:45:22 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1410479065.c48d5cbb505936d6b93e6f6c40589d1ac6f6c635.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c48d5cbb505936d6b93e6f6c40589d1ac6f6c635 X-VCS-Branch: master Date: Thu, 11 Sep 2014 23:45:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3bb57b14-f4ac-4d3c-892d-6871f30fb3c1 X-Archives-Hash: dfcc836541e050f6bc082e6b465345f4 commit: c48d5cbb505936d6b93e6f6c40589d1ac6f6c635 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 17 17:48:41 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Sep 11 23:44:25 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c48d5cbb econf: Add EAPI-conditional arguments via array Use a dedicated array variable to add EAPI-conditional arguments to the configure script instead of prepending them to the command parameters. --- bin/phase-helpers.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index f0e298f..ca28ce9 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -521,18 +521,19 @@ econf() { done fi + local conf_args=() if ___eapi_econf_passes_--disable-dependency-tracking || ___eapi_econf_passes_--disable-silent-rules; then local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null) if ___eapi_econf_passes_--disable-dependency-tracking; then if [[ ${conf_help} == *--disable-dependency-tracking* ]]; then - set -- --disable-dependency-tracking "$@" + conf_args+=( --disable-dependency-tracking ) fi fi if ___eapi_econf_passes_--disable-silent-rules; then if [[ ${conf_help} == *--disable-silent-rules* ]]; then - set -- --disable-silent-rules "$@" + conf_args+=( --disable-silent-rules ) fi fi fi @@ -550,7 +551,9 @@ econf() { CONF_PREFIX=${CONF_PREFIX#*=} [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" [[ ${CONF_LIBDIR} != /* ]] && CONF_LIBDIR="/${CONF_LIBDIR}" - set -- --libdir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_LIBDIR}")" "$@" + conf_args+=( + --libdir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_LIBDIR}")" + ) fi # Handle arguments containing quoted whitespace (see bug #457136). @@ -566,6 +569,7 @@ econf() { --datadir="${EPREFIX}"/usr/share \ --sysconfdir="${EPREFIX}"/etc \ --localstatedir="${EPREFIX}"/var/lib \ + "${conf_args[@]}" \ "$@" \ "${EXTRA_ECONF[@]}" __vecho "${ECONF_SOURCE}/configure" "$@"