diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-04-18 15:47:28 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-04-18 15:47:28 +0000 |
| commit | e29801bd4b148b6a0b2f85b177ad3c58698b7b21 (patch) | |
| tree | 2774a2abd9c978ab87f790b41b5f3cc9e82150f7 | |
| parent | Stable for HPPA (bug #465420). (diff) | |
| download | gentoo-2-e29801bd4b148b6a0b2f85b177ad3c58698b7b21.tar.gz gentoo-2-e29801bd4b148b6a0b2f85b177ad3c58698b7b21.tar.bz2 gentoo-2-e29801bd4b148b6a0b2f85b177ad3c58698b7b21.zip | |
Fix python_*_all() phases with DISTUTILS_SINGLE_IMPL.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index af7c68b64b55..7582f8f44abd 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.793 2013/04/17 20:59:24 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.794 2013/04/18 15:47:28 mgorny Exp $ + + 18 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Fix python_*_all() phases with DISTUTILS_SINGLE_IMPL. 17 Apr 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass: Reverted .tmp_gas_check patch, see bug #336732. diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index c3d15cdaeb6a..991d0a1f083f 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -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.68 2013/04/13 14:01:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.69 2013/04/18 15:47:28 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -532,11 +532,16 @@ distutils-r1_run_phase() { _distutils-r1_run_common_phase() { local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR} - local MULTIBUILD_VARIANTS - _python_obtain_impls + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + local MULTIBUILD_VARIANTS + _python_obtain_impls - multibuild_for_best_variant _python_multibuild_wrapper \ - distutils-r1_run_phase "${@}" + multibuild_for_best_variant _python_multibuild_wrapper \ + distutils-r1_run_phase "${@}" + else + # semi-hack, be careful. + _distutils-r1_run_foreach_impl "${@}" + fi } # @FUNCTION: _distutils-r1_run_foreach_impl |