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 D763B198005 for ; Mon, 4 Mar 2013 19:29:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9B3AE07E6; Mon, 4 Mar 2013 19:29:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4386BE07E6 for ; Mon, 4 Mar 2013 19:29:46 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0ADF433DC00 for ; Mon, 4 Mar 2013 19:29:45 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id C66652171D; Mon, 4 Mar 2013 19:29:43 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog distutils-r1.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130304192943.C66652171D@flycatcher.gentoo.org> Date: Mon, 4 Mar 2013 19:29:43 +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: 0ad44a4a-163f-46fd-aa23-6eed98b82902 X-Archives-Hash: af49d07f4077051db20e7dff9443813f mgorny 13/03/04 19:29:43 Modified: ChangeLog distutils-r1.eclass Log: Use multilib_for_best_variant() for the *_all() phases. Revision Changes Path 1.711 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.711&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.711&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.710&r2=1.711 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- ChangeLog 4 Mar 2013 19:28:47 -0000 1.710 +++ ChangeLog 4 Mar 2013 19:29:43 -0000 1.711 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.710 2013/03/04 19:28:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.711 2013/03/04 19:29:43 mgorny Exp $ + + 04 Mar 2013; Michał Górny distutils-r1.eclass: + Use multilib_for_best_variant() for the *_all() phases. 04 Mar 2013; Michał Górny distutils-r1.eclass, python-r1.eclass: 1.62 eclass/distutils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.62&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.62&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.61&r2=1.62 Index: distutils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- distutils-r1.eclass 4 Mar 2013 19:28:47 -0000 1.61 +++ distutils-r1.eclass 4 Mar 2013 19:29:43 -0000 1.62 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.61 2013/03/04 19:28:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.62 2013/03/04 19:29:43 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -549,11 +549,6 @@ then popd >/dev/null || die fi - - # Store them for reuse. - _DISTUTILS_BEST_IMPL=( - "${EPYTHON}" "${PYTHON}" "${BUILD_DIR}" "${PYTHONPATH}" - ) } # @FUNCTION: _distutils-r1_run_common_phase @@ -567,23 +562,11 @@ _distutils-r1_run_common_phase() { local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR} - local EPYTHON=${_DISTUTILS_BEST_IMPL[0]} - local PYTHON=${_DISTUTILS_BEST_IMPL[1]} - local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]} - local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]} - - export EPYTHON PYTHON PYTHONPATH - - if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then - pushd "${BUILD_DIR}"/.. >/dev/null || die - fi + local MULTIBUILD_VARIANTS + _python_obtain_impls - einfo "common: running ${1}" - "${@}" - - if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then - popd >/dev/null || die - fi + multibuild_for_best_variant _python_multibuild_wrapper \ + distutils-r1_run_phase "${@}" } # @FUNCTION: _distutils-r1_run_foreach_impl