| 1 |
vapier 12/06/24 05:35:02 |
| 2 |
|
| 3 |
Modified: sandbox-2.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Parallelize configure steps for multiple ABIs, and run tests in parallel. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha112/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 sys-apps/sandbox/sandbox-2.5.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: sandbox-2.5.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- sandbox-2.5.ebuild 5 Feb 2012 04:50:08 -0000 1.9 |
| 23 |
+++ sandbox-2.5.ebuild 24 Jun 2012 05:35:02 -0000 1.10 |
| 24 |
@@ -1,13 +1,13 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.9 2012/02/05 04:50:08 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.10 2012/06/24 05:35:02 vapier Exp $ |
| 29 |
|
| 30 |
# |
| 31 |
# don't monkey with this ebuild unless contacting portage devs. |
| 32 |
# period. |
| 33 |
# |
| 34 |
|
| 35 |
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker |
| 36 |
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing |
| 37 |
|
| 38 |
DESCRIPTION="sandbox'd LD_PRELOAD hack" |
| 39 |
HOMEPAGE="http://www.gentoo.org/" |
| 40 |
@@ -33,45 +33,62 @@ |
| 41 |
|
| 42 |
sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } |
| 43 |
|
| 44 |
-src_compile() { |
| 45 |
- filter-lfs-flags #90228 |
| 46 |
- |
| 47 |
+sb_foreach_abi() { |
| 48 |
local OABI=${ABI} |
| 49 |
for ABI in $(sb_get_install_abis) ; do |
| 50 |
- mkdir "${WORKDIR}/build-${ABI}" |
| 51 |
cd "${WORKDIR}/build-${ABI}" |
| 52 |
- |
| 53 |
- use multilib && multilib_toolchain_setup ${ABI} |
| 54 |
- |
| 55 |
- einfo "Configuring sandbox for ABI=${ABI}..." |
| 56 |
- ECONF_SOURCE="../${P}/" \ |
| 57 |
- econf ${myconf} || die |
| 58 |
- einfo "Building sandbox for ABI=${ABI}..." |
| 59 |
- emake || die |
| 60 |
+ einfo "Running $1 for ABI=${ABI}..." |
| 61 |
+ "$@" |
| 62 |
done |
| 63 |
ABI=${OABI} |
| 64 |
} |
| 65 |
|
| 66 |
-src_test() { |
| 67 |
+sb_configure() { |
| 68 |
+ mkdir "${WORKDIR}/build-${ABI}" |
| 69 |
+ cd "${WORKDIR}/build-${ABI}" |
| 70 |
+ |
| 71 |
+ use multilib && multilib_toolchain_setup ${ABI} |
| 72 |
+ |
| 73 |
+ einfo "Configuring sandbox for ABI=${ABI}..." |
| 74 |
+ ECONF_SOURCE="../${P}/" \ |
| 75 |
+ econf ${myconf} || die |
| 76 |
+} |
| 77 |
+ |
| 78 |
+sb_compile() { |
| 79 |
+ emake || die |
| 80 |
+} |
| 81 |
+ |
| 82 |
+src_compile() { |
| 83 |
+ filter-lfs-flags #90228 |
| 84 |
+ |
| 85 |
+ # Run configures in parallel! |
| 86 |
+ multijob_init |
| 87 |
local OABI=${ABI} |
| 88 |
for ABI in $(sb_get_install_abis) ; do |
| 89 |
- cd "${WORKDIR}/build-${ABI}" |
| 90 |
- einfo "Checking sandbox for ABI=${ABI}..." |
| 91 |
- emake check || die "make check failed for ${ABI}" |
| 92 |
+ multijob_child_init sb_configure |
| 93 |
done |
| 94 |
ABI=${OABI} |
| 95 |
+ multijob_finish |
| 96 |
+ |
| 97 |
+ sb_foreach_abi sb_compile |
| 98 |
+} |
| 99 |
+ |
| 100 |
+sb_test() { |
| 101 |
+ emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die |
| 102 |
+} |
| 103 |
+ |
| 104 |
+src_test() { |
| 105 |
+ sb_foreach_abi sb_test |
| 106 |
+} |
| 107 |
+ |
| 108 |
+sb_install() { |
| 109 |
+ emake DESTDIR="${D}" install || die |
| 110 |
+ insinto /etc/sandbox.d #333131 |
| 111 |
+ doins etc/sandbox.d/00default || die |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
- local OABI=${ABI} |
| 116 |
- for ABI in $(sb_get_install_abis) ; do |
| 117 |
- cd "${WORKDIR}/build-${ABI}" |
| 118 |
- einfo "Installing sandbox for ABI=${ABI}..." |
| 119 |
- emake DESTDIR="${D}" install || die "make install failed for ${ABI}" |
| 120 |
- insinto /etc/sandbox.d #333131 |
| 121 |
- doins etc/sandbox.d/00default || die |
| 122 |
- done |
| 123 |
- ABI=${OABI} |
| 124 |
+ sb_foreach_abi sb_install |
| 125 |
|
| 126 |
doenvd "${FILESDIR}"/09sandbox |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
|
| 131 |
1.163 sys-apps/sandbox/ChangeLog |
| 132 |
|
| 133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sandbox/ChangeLog?rev=1.163&view=markup |
| 134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sandbox/ChangeLog?rev=1.163&content-type=text/plain |
| 135 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sandbox/ChangeLog?r1=1.162&r2=1.163 |
| 136 |
|
| 137 |
Index: ChangeLog |
| 138 |
=================================================================== |
| 139 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v |
| 140 |
retrieving revision 1.162 |
| 141 |
retrieving revision 1.163 |
| 142 |
diff -u -r1.162 -r1.163 |
| 143 |
--- ChangeLog 30 Mar 2012 15:58:53 -0000 1.162 |
| 144 |
+++ ChangeLog 24 Jun 2012 05:35:02 -0000 1.163 |
| 145 |
@@ -1,6 +1,9 @@ |
| 146 |
# ChangeLog for sys-apps/sandbox |
| 147 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 148 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.162 2012/03/30 15:58:53 aballier Exp $ |
| 149 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.163 2012/06/24 05:35:02 vapier Exp $ |
| 150 |
+ |
| 151 |
+ 24 Jun 2012; Mike Frysinger <vapier@g.o> sandbox-2.5.ebuild: |
| 152 |
+ Parallelize configure steps for multiple ABIs, and run tests in parallel. |
| 153 |
|
| 154 |
30 Mar 2012; Alexis Ballier <aballier@g.o> sandbox-1.6-r2.ebuild: |
| 155 |
keyword -x86-fbsd for bug #374425, sandbox is broken of fbsd and this leaves |
Archives