Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: multilib@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/3] Disable wrapping only if multilib-portage is used.
Date: Wed, 23 Apr 2014 12:57:55
Message-Id: 1398257821-17286-2-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] multilib RFC: improving wrapping compatibility with non-multilib and multilib-portage systems by "Michał Górny"
1 In other words, enable wrapping for non-multilib systems as well. While
2 this isn't necessary, it shouldn't hurt and it improves consistency
3 between systems. As a result, ebuilds can now safely use
4 '${CHOST}-executable' calls without checking whether the system is
5 multilib.
6 ---
7 eclass/multilib-build.eclass | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-)
9
10 diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
11 index 02f9634..4b6a953 100644
12 --- a/eclass/multilib-build.eclass
13 +++ b/eclass/multilib-build.eclass
14 @@ -295,7 +295,7 @@ multilib_prepare_wrappers() {
15
16 [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
17
18 - [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
19 + [[ ${COMPLETE_MULTILIB} == yes ]] && return
20
21 local root=${1:-${ED}}
22 local f
23 @@ -421,7 +421,7 @@ multilib_install_wrappers() {
24
25 [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
26
27 - [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
28 + [[ ${COMPLETE_MULTILIB} == yes ]] && return
29
30 local root=${1:-${ED}}
31
32 --
33 1.9.2

Replies