diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-29 20:56:46 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-29 20:56:46 +0000 |
| commit | 13d1811a742a5d72ebbd47e4def352cdc84ab143 (patch) | |
| tree | 2bf1b2a457b2293ba620e3a02bb6b9a9a6fe4bf1 /eclass | |
| parent | Move conditionals for enabling wrappers into multilib_prepare_wrappers() and ... (diff) | |
| download | historical-13d1811a742a5d72ebbd47e4def352cdc84ab143.tar.gz historical-13d1811a742a5d72ebbd47e4def352cdc84ab143.tar.bz2 historical-13d1811a742a5d72ebbd47e4def352cdc84ab143.zip | |
Disable wrappers for multilib portage only. Enable them in non-multilib profiles for consistency.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 26abcf7b6a3e..65c595c83fec 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1228 2014/04/29 20:54:54 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1229 2014/04/29 20:56:46 mgorny Exp $ + + 29 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Disable wrappers for multilib portage only. Enable them in non-multilib + profiles for consistency. 29 Apr 2014; Michał Górny <mgorny@gentoo.org> cmake-multilib.eclass, multilib-build.eclass, multilib-minimal.eclass: diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index b7a1aff8c3c2..273d79a8c7da 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.41 2014/04/29 20:54:54 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.42 2014/04/29 20:56:46 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -295,7 +295,7 @@ multilib_prepare_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" - [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return + [[ ${COMPLETE_MULTILIB} == yes ]] && return local root=${1:-${ED}} local f @@ -421,7 +421,7 @@ multilib_install_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" - [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return + [[ ${COMPLETE_MULTILIB} == yes ]] && return local root=${1:-${ED}} |