From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D57261381FA for ; Fri, 23 May 2014 07:38:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FE91E08BD; Fri, 23 May 2014 07:38:40 +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 D38C6E08BD for ; Fri, 23 May 2014 07:38:39 +0000 (UTC) Received: from flycatcher.gentoo.org (unknown [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 7FCCB33FD1B for ; Fri, 23 May 2014 07:38:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 2A93E2004C; Fri, 23 May 2014 07:38:36 +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: <20140523073837.2A93E2004C@flycatcher.gentoo.org> Date: Fri, 23 May 2014 07:38:36 +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: 6aa74b2d-e12a-438e-940f-5e3ff910ac5b X-Archives-Hash: cf23311915ac6c8eb49103aa3dd4dbd4 mgorny 14/05/23 07:38:36 Modified: ChangeLog multilib-build.eclass Log: Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478. Revision Changes Path 1.1267 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1266&r2=1.1267 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1266 retrieving revision 1.1267 diff -u -r1.1266 -r1.1267 --- ChangeLog 23 May 2014 07:11:53 -0000 1.1266 +++ ChangeLog 23 May 2014 07:38:36 -0000 1.1267 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1266 2014/05/23 07:11:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1267 2014/05/23 07:38:36 mgorny Exp $ + + 23 May 2014; Michał Górny multilib-build.eclass: + Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478. 23 May 2014; Michał Górny multilib-build.eclass: Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI 1.50 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.49&r2=1.50 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- multilib-build.eclass 23 May 2014 07:11:53 -0000 1.49 +++ multilib-build.eclass 23 May 2014 07:38:36 -0000 1.50 @@ -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.49 2014/05/23 07:11:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.50 2014/05/23 07:38:36 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -74,6 +74,24 @@ # net-libs/libbar[ssl,${MULTILIB_USEDEP}]" # @CODE +# @ECLASS-VARIABLE: MULTILIB_ABI_FLAG +# @DEFAULT_UNSET +# @DESCRIPTION: +# The complete ABI name. Resembles the USE flag name. +# +# This is set within multilib_foreach_abi(), +# multilib_parallel_foreach_abi() and multilib-minimal sub-phase +# functions. +# +# It may be null (empty) when the build is done on ABI not controlled +# by a USE flag (e.g. on non-multilib arch or when using multilib +# portage). The build will always be done for a single ABI then. +# +# Example value: +# @CODE +# abi_x86_64 +# @CODE + _multilib_build_set_globals() { local flags=( "${_MULTILIB_FLAGS[@]%:*}" ) @@ -161,7 +179,9 @@ _multilib_multibuild_wrapper() { debug-print-function ${FUNCNAME} "${@}" - local ABI=${MULTIBUILD_VARIANT} + local ABI=${MULTIBUILD_VARIANT#*:} + local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%:*} + multilib_toolchain_setup "${ABI}" "${@}" } @@ -178,7 +198,7 @@ multilib_foreach_abi() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" } @@ -197,7 +217,7 @@ multilib_parallel_foreach_abi() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}" } @@ -208,7 +228,7 @@ multilib_for_best_abi() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" } @@ -262,7 +282,7 @@ multilib_copy_sources() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_copy_sources }