From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
Date: Fri, 23 May 2014 07:38:36 +0000 (UTC) [thread overview]
Message-ID: <20140523073837.2A93E2004C@flycatcher.gentoo.org> (raw)
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 <mgorny@gentoo.org> multilib-build.eclass:
+ Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478.
23 May 2014; Michał Górny <mgorny@gentoo.org> 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
}
next reply other threads:[~2014-05-23 7:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-23 7:38 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-26 20:43 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass Michal Gorny (mgorny)
2014-08-17 3:34 Jonathan Callen (jcallen)
2014-07-04 13:02 Michal Gorny (mgorny)
2014-07-03 17:45 Fabian Groffen (grobian)
2014-07-03 8:27 Michal Gorny (mgorny)
2014-07-03 7:48 Michal Gorny (mgorny)
2014-06-29 8:32 Michal Gorny (mgorny)
2014-06-29 7:53 Michal Gorny (mgorny)
2014-06-28 9:56 Michal Gorny (mgorny)
2014-06-08 13:57 Michal Gorny (mgorny)
2014-05-28 18:53 Michal Gorny (mgorny)
2014-05-23 17:11 Michal Gorny (mgorny)
2014-05-23 7:53 Michal Gorny (mgorny)
2014-05-23 7:47 Michal Gorny (mgorny)
2014-05-23 7:39 Michal Gorny (mgorny)
2014-05-23 7:11 Michal Gorny (mgorny)
2014-05-12 21:56 Michal Gorny (mgorny)
2014-05-07 17:33 Michal Gorny (mgorny)
2014-05-01 9:52 Michal Gorny (mgorny)
2014-04-29 20:59 Michal Gorny (mgorny)
2014-04-29 20:59 Michal Gorny (mgorny)
2014-04-29 20:57 Michal Gorny (mgorny)
2014-04-29 20:56 Michal Gorny (mgorny)
2014-04-28 17:38 Michal Gorny (mgorny)
2014-04-22 20:12 Michal Gorny (mgorny)
2014-04-21 7:58 Michal Gorny (mgorny)
2014-04-21 7:27 Michal Gorny (mgorny)
2014-04-21 7:22 Michal Gorny (mgorny)
2014-04-21 7:17 Michal Gorny (mgorny)
2014-04-03 21:38 Michal Gorny (mgorny)
2014-04-03 21:32 Michal Gorny (mgorny)
2014-03-31 15:32 Michal Gorny (mgorny)
2014-03-30 8:41 Michal Gorny (mgorny)
2014-01-16 20:05 Michal Gorny (mgorny)
2014-01-16 18:53 Michal Gorny (mgorny)
2013-12-31 18:31 Michal Gorny (mgorny)
2013-10-01 18:06 Michal Gorny (mgorny)
2013-10-01 17:42 Michal Gorny (mgorny)
2013-09-30 7:27 Michal Gorny (mgorny)
2013-09-17 13:29 Thomas Sachau (tommy)
2013-09-17 12:25 Thomas Sachau (tommy)
2013-08-08 10:20 Michal Gorny (mgorny)
2013-07-30 2:08 Matt Turner (mattst88)
2013-07-11 6:57 Michal Gorny (mgorny)
2013-06-28 2:37 Michal Gorny (mgorny)
2013-03-09 13:52 Michal Gorny (mgorny)
2013-03-04 19:31 Michal Gorny (mgorny)
2013-03-04 19:30 Michal Gorny (mgorny)
2013-03-02 18:18 Michal Gorny (mgorny)
2013-02-27 23:23 Michal Gorny (mgorny)
2013-02-26 21:05 Michal Gorny (mgorny)
2013-02-26 14:42 Michal Gorny (mgorny)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140523073837.2A93E2004C@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox