| 1 |
floppym 13/12/08 03:23:23 |
| 2 |
|
| 3 |
Modified: chromium-33.0.1726.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Refactor ninja option processing into eninja function. Add load average support, thanks to M.B. in bug 490624. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 www-client/chromium/chromium-33.0.1726.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: chromium-33.0.1726.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- chromium-33.0.1726.0.ebuild 4 Dec 2013 04:20:00 -0000 1.1 |
| 23 |
+++ chromium-33.0.1726.0.ebuild 8 Dec 2013 03:23:23 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild,v 1.1 2013/12/04 04:20:00 phajdan.jr Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild,v 1.2 2013/12/08 03:23:23 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 32 |
@@ -424,6 +424,23 @@ |
| 33 |
egyp_chromium ${myconf} || die |
| 34 |
} |
| 35 |
|
| 36 |
+eninja() { |
| 37 |
+ if [[ -z ${NINJAOPTS+set} ]]; then |
| 38 |
+ local jobs=$(makeopts_jobs) |
| 39 |
+ local loadavg=$(makeopts_loadavg) |
| 40 |
+ |
| 41 |
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then |
| 42 |
+ NINJAOPTS+=" -j ${jobs}" |
| 43 |
+ fi |
| 44 |
+ if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then |
| 45 |
+ NINJAOPTS+=" -l ${loadavg}" |
| 46 |
+ fi |
| 47 |
+ fi |
| 48 |
+ set -- ninja -v ${NINJAOPTS} "$@" |
| 49 |
+ echo "$@" |
| 50 |
+ "$@" |
| 51 |
+} |
| 52 |
+ |
| 53 |
src_compile() { |
| 54 |
# TODO: add media_unittests after fixing compile (bug #462546). |
| 55 |
local test_targets="" |
| 56 |
@@ -438,12 +455,12 @@ |
| 57 |
fi |
| 58 |
|
| 59 |
# Build mksnapshot and pax-mark it. |
| 60 |
- ninja -C out/Release -v -j $(makeopts_jobs) mksnapshot.${target_arch} || die |
| 61 |
+ eninja -C out/Release mksnapshot.${target_arch} || die |
| 62 |
pax-mark m out/Release/mksnapshot.${target_arch} |
| 63 |
|
| 64 |
# Even though ninja autodetects number of CPUs, we respect |
| 65 |
# user's options, for debugging with -j 1 or any other reason. |
| 66 |
- ninja -C out/Release -v -j $(makeopts_jobs) ${ninja_targets} || die |
| 67 |
+ eninja -C out/Release ${ninja_targets} || die |
| 68 |
|
| 69 |
pax-mark m out/Release/chrome |
| 70 |
if use test; then |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.1001 www-client/chromium/ChangeLog |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.1001&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.1001&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.1000&r2=1.1001 |
| 79 |
|
| 80 |
Index: ChangeLog |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
| 83 |
retrieving revision 1.1000 |
| 84 |
retrieving revision 1.1001 |
| 85 |
diff -u -r1.1000 -r1.1001 |
| 86 |
--- ChangeLog 6 Dec 2013 20:41:53 -0000 1.1000 |
| 87 |
+++ ChangeLog 8 Dec 2013 03:23:23 -0000 1.1001 |
| 88 |
@@ -1,6 +1,10 @@ |
| 89 |
# ChangeLog for www-client/chromium |
| 90 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1000 2013/12/06 20:41:53 ago Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1001 2013/12/08 03:23:23 floppym Exp $ |
| 93 |
+ |
| 94 |
+ 08 Dec 2013; Mike Gilbert <floppym@g.o> chromium-33.0.1726.0.ebuild: |
| 95 |
+ Refactor ninja option processing into eninja function. Add load average |
| 96 |
+ support, thanks to M.B. in bug 490624. |
| 97 |
|
| 98 |
06 Dec 2013; Agostino Sarubbo <ago@g.o> chromium-31.0.1650.63.ebuild: |
| 99 |
Stable for x86, wrt bug #493364 |
Archives