From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9073113877A for ; Sun, 29 Jun 2014 07:53:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DE28E0B1B; Sun, 29 Jun 2014 07:53:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6F37E0B1B for ; Sun, 29 Jun 2014 07:53:36 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E400234016D for ; Sun, 29 Jun 2014 07:53:35 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id E5A7F2004E; Sun, 29 Jun 2014 07:53:33 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog multilib-build.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140629075333.E5A7F2004E@flycatcher.gentoo.org> Date: Sun, 29 Jun 2014 07:53:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d340b373-75ed-490a-bcf0-3bff5268e3c7 X-Archives-Hash: 8775bd8f2555e26634adbf8c6eec88cf mgorny 14/06/29 07:53:33 Modified: ChangeLog multilib-build.eclass Log: Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg Turner. Revision Changes Path 1.1304 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1304&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1304&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1303&r2=1.1304 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1303 retrieving revision 1.1304 diff -u -r1.1303 -r1.1304 --- ChangeLog 28 Jun 2014 09:56:25 -0000 1.1303 +++ ChangeLog 29 Jun 2014 07:53:33 -0000 1.1304 @@ -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.1303 2014/06/28 09:56:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1304 2014/06/29 07:53:33 mgorny Exp $ + + 29 Jun 2014; Michał Górny multilib-build.eclass: + Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg + Turner. 28 Jun 2014; Michał Górny multilib-build.eclass: Enable multilib flags for ppc. Since ppc profiles are not multilib at the 1.58 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.58&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.58&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.57&r2=1.58 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- multilib-build.eclass 28 Jun 2014 09:56:26 -0000 1.57 +++ multilib-build.eclass 29 Jun 2014 07:53:33 -0000 1.58 @@ -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.57 2014/06/28 09:56:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -153,7 +153,10 @@ # paludis is broken (bug #486592), and switching it locally # for the split is more complex than cheating like this for m_abi in ${m_abis//,/ }; do - if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then + if [[ ${m_abi} == ${abi} ]] \ + && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \ + && use "${m_flag}" + then echo "${m_flag}.${abi}" found=1 break 2