| 1 |
mgorny 13/03/04 19:30:28 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Convert to use multibuild.eclass. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.712 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.712&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.712&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.711&r2=1.712 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.711 |
| 18 |
retrieving revision 1.712 |
| 19 |
diff -u -r1.711 -r1.712 |
| 20 |
--- ChangeLog 4 Mar 2013 19:29:43 -0000 1.711 |
| 21 |
+++ ChangeLog 4 Mar 2013 19:30:28 -0000 1.712 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.711 2013/03/04 19:29:43 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.712 2013/03/04 19:30:28 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 04 Mar 2013; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Convert to use multibuild.eclass. |
| 30 |
|
| 31 |
04 Mar 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 32 |
Use multilib_for_best_variant() for the *_all() phases. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.8 eclass/multilib-build.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.8&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.8&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.7&r2=1.8 |
| 41 |
|
| 42 |
Index: multilib-build.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 45 |
retrieving revision 1.7 |
| 46 |
retrieving revision 1.8 |
| 47 |
diff -u -r1.7 -r1.8 |
| 48 |
--- multilib-build.eclass 2 Mar 2013 18:18:13 -0000 1.7 |
| 49 |
+++ multilib-build.eclass 4 Mar 2013 19:30:28 -0000 1.8 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2013 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.7 2013/03/02 18:18:13 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.8 2013/03/04 19:30:28 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: multilib-build.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -23,7 +23,7 @@ |
| 59 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 60 |
esac |
| 61 |
|
| 62 |
-inherit multilib multiprocessing |
| 63 |
+inherit multibuild multilib |
| 64 |
|
| 65 |
# @ECLASS-VARIABLE: _MULTILIB_FLAGS |
| 66 |
# @INTERNAL |
| 67 |
@@ -91,6 +91,19 @@ |
| 68 |
fi |
| 69 |
} |
| 70 |
|
| 71 |
+# @FUNCTION: _multilib_multibuild_wrapper |
| 72 |
+# @USAGE: <argv>... |
| 73 |
+# @INTERNAL |
| 74 |
+# @DESCRIPTION: |
| 75 |
+# Initialize the environment for ABI selected for multibuild. |
| 76 |
+_multilib_multibuild_wrapper() { |
| 77 |
+ debug-print-function ${FUNCNAME} "${@}" |
| 78 |
+ |
| 79 |
+ local ABI=${MULTIBUILD_VARIANT} |
| 80 |
+ multilib_toolchain_setup "${ABI}" |
| 81 |
+ "${@}" |
| 82 |
+} |
| 83 |
+ |
| 84 |
# @FUNCTION: multilib_foreach_abi |
| 85 |
# @USAGE: <argv>... |
| 86 |
# @DESCRIPTION: |
| 87 |
@@ -101,14 +114,10 @@ |
| 88 |
# If multilib support is disabled, it just runs the commands. No setup |
| 89 |
# is done. |
| 90 |
multilib_foreach_abi() { |
| 91 |
- local initial_dir=${BUILD_DIR:-${S}} |
| 92 |
+ debug-print-function ${FUNCNAME} "${@}" |
| 93 |
|
| 94 |
- local abis=( $(multilib_get_enabled_abis) ) |
| 95 |
- local ABI |
| 96 |
- for ABI in "${abis[@]}"; do |
| 97 |
- multilib_toolchain_setup "${ABI}" |
| 98 |
- BUILD_DIR=${initial_dir%%/}-${ABI} "${@}" |
| 99 |
- done |
| 100 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 101 |
+ multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" |
| 102 |
} |
| 103 |
|
| 104 |
# @FUNCTION: multilib_parallel_foreach_abi |
| 105 |
@@ -124,25 +133,10 @@ |
| 106 |
# |
| 107 |
# Useful for running configure scripts. |
| 108 |
multilib_parallel_foreach_abi() { |
| 109 |
- local initial_dir=${BUILD_DIR:-${S}} |
| 110 |
- |
| 111 |
- multijob_init |
| 112 |
- |
| 113 |
- local abis=( $(multilib_get_enabled_abis) ) |
| 114 |
- local ABI |
| 115 |
- for ABI in "${abis[@]}"; do |
| 116 |
- ( |
| 117 |
- multijob_child_init |
| 118 |
- |
| 119 |
- multilib_toolchain_setup "${ABI}" |
| 120 |
- BUILD_DIR=${initial_dir%%/}-${ABI} |
| 121 |
- "${@}" |
| 122 |
- ) & |
| 123 |
- |
| 124 |
- multijob_post_fork |
| 125 |
- done |
| 126 |
+ debug-print-function ${FUNCNAME} "${@}" |
| 127 |
|
| 128 |
- multijob_finish |
| 129 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 130 |
+ multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}" |
| 131 |
} |
| 132 |
|
| 133 |
# @FUNCTION: multilib_check_headers |
Archives