Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:multilib commit in: bin/
Date: Sun, 01 Jul 2012 11:59:14
Message-Id: 1341143901.0604da19dcfd201686a980edcdb0ed70a06427ff.tommy@gentoo
1 commit: 0604da19dcfd201686a980edcdb0ed70a06427ff
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 1 11:58:21 2012 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 1 11:58:21 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0604da19
7
8 Missed a location for abiwrapper switch in the loop check
9
10 ---
11 bin/auto-multilib.sh | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14 diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
15 index 4287f0f..be0b05c 100755
16 --- a/bin/auto-multilib.sh
17 +++ b/bin/auto-multilib.sh
18 @@ -310,7 +310,7 @@ _finalize_abi_install() {
19 local LIBDIR=$(get_abi_var LIBDIR $1)
20 if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
21 (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
22 - ( ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]] && \
23 + ( use abiwrapper && \
24 ( [[ -d "${D}"usr/bin ]] || \
25 [[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then