summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-04-29 20:56:46 +0000
committerMichał Górny <mgorny@gentoo.org>2014-04-29 20:56:46 +0000
commite05c55e87cb9a33a0cc414a99d8403a2f20766e0 (patch)
tree4ab944d310f4e825cc8ca296f95d98ceeb722703 /eclass/multilib-build.eclass
parentMove conditionals for enabling wrappers into multilib_prepare_wrappers() and ... (diff)
downloadgentoo-2-e05c55e87cb9a33a0cc414a99d8403a2f20766e0.tar.gz
gentoo-2-e05c55e87cb9a33a0cc414a99d8403a2f20766e0.tar.bz2
gentoo-2-e05c55e87cb9a33a0cc414a99d8403a2f20766e0.zip
Disable wrappers for multilib portage only. Enable them in non-multilib profiles for consistency.
Diffstat (limited to 'eclass/multilib-build.eclass')
-rw-r--r--eclass/multilib-build.eclass6
1 files changed, 3 insertions, 3 deletions
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}}