| 1 |
mgorny 14/05/23 07:38:36 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1267 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1266&r2=1.1267 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1266 |
| 18 |
retrieving revision 1.1267 |
| 19 |
diff -u -r1.1266 -r1.1267 |
| 20 |
--- ChangeLog 23 May 2014 07:11:53 -0000 1.1266 |
| 21 |
+++ ChangeLog 23 May 2014 07:38:36 -0000 1.1267 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1266 2014/05/23 07:11:53 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1267 2014/05/23 07:38:36 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 23 May 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478. |
| 30 |
|
| 31 |
23 May 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 32 |
Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.50 eclass/multilib-build.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.49&r2=1.50 |
| 41 |
|
| 42 |
Index: multilib-build.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 45 |
retrieving revision 1.49 |
| 46 |
retrieving revision 1.50 |
| 47 |
diff -u -r1.49 -r1.50 |
| 48 |
--- multilib-build.eclass 23 May 2014 07:11:53 -0000 1.49 |
| 49 |
+++ multilib-build.eclass 23 May 2014 07:38:36 -0000 1.50 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.49 2014/05/23 07:11:53 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.50 2014/05/23 07:38:36 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: multilib-build.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -74,6 +74,24 @@ |
| 59 |
# net-libs/libbar[ssl,${MULTILIB_USEDEP}]" |
| 60 |
# @CODE |
| 61 |
|
| 62 |
+# @ECLASS-VARIABLE: MULTILIB_ABI_FLAG |
| 63 |
+# @DEFAULT_UNSET |
| 64 |
+# @DESCRIPTION: |
| 65 |
+# The complete ABI name. Resembles the USE flag name. |
| 66 |
+# |
| 67 |
+# This is set within multilib_foreach_abi(), |
| 68 |
+# multilib_parallel_foreach_abi() and multilib-minimal sub-phase |
| 69 |
+# functions. |
| 70 |
+# |
| 71 |
+# It may be null (empty) when the build is done on ABI not controlled |
| 72 |
+# by a USE flag (e.g. on non-multilib arch or when using multilib |
| 73 |
+# portage). The build will always be done for a single ABI then. |
| 74 |
+# |
| 75 |
+# Example value: |
| 76 |
+# @CODE |
| 77 |
+# abi_x86_64 |
| 78 |
+# @CODE |
| 79 |
+ |
| 80 |
_multilib_build_set_globals() { |
| 81 |
local flags=( "${_MULTILIB_FLAGS[@]%:*}" ) |
| 82 |
|
| 83 |
@@ -161,7 +179,9 @@ |
| 84 |
_multilib_multibuild_wrapper() { |
| 85 |
debug-print-function ${FUNCNAME} "${@}" |
| 86 |
|
| 87 |
- local ABI=${MULTIBUILD_VARIANT} |
| 88 |
+ local ABI=${MULTIBUILD_VARIANT#*:} |
| 89 |
+ local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%:*} |
| 90 |
+ |
| 91 |
multilib_toolchain_setup "${ABI}" |
| 92 |
"${@}" |
| 93 |
} |
| 94 |
@@ -178,7 +198,7 @@ |
| 95 |
multilib_foreach_abi() { |
| 96 |
debug-print-function ${FUNCNAME} "${@}" |
| 97 |
|
| 98 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 99 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 100 |
multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" |
| 101 |
} |
| 102 |
|
| 103 |
@@ -197,7 +217,7 @@ |
| 104 |
multilib_parallel_foreach_abi() { |
| 105 |
debug-print-function ${FUNCNAME} "${@}" |
| 106 |
|
| 107 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 108 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 109 |
multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}" |
| 110 |
} |
| 111 |
|
| 112 |
@@ -208,7 +228,7 @@ |
| 113 |
multilib_for_best_abi() { |
| 114 |
debug-print-function ${FUNCNAME} "${@}" |
| 115 |
|
| 116 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 117 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 118 |
|
| 119 |
multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" |
| 120 |
} |
| 121 |
@@ -262,7 +282,7 @@ |
| 122 |
multilib_copy_sources() { |
| 123 |
debug-print-function ${FUNCNAME} "${@}" |
| 124 |
|
| 125 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 126 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 127 |
multibuild_copy_sources |
| 128 |
} |
Archives