Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
Date: Fri, 18 Nov 2011 16:41:50
Message-Id: 20111118164139.0047920033@flycatcher.gentoo.org
1 caster 11/11/18 16:41:38
2
3 Modified: ChangeLog icedtea-7.2.0-r1.ebuild
4 icedtea-6.1.10.4-r1.ebuild
5 Log:
6 Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants. Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
7
8 (Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.49 dev-java/icedtea/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.49&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.49&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.48&r2=1.49
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
20 retrieving revision 1.48
21 retrieving revision 1.49
22 diff -u -r1.48 -r1.49
23 --- ChangeLog 18 Nov 2011 11:01:45 -0000 1.48
24 +++ ChangeLog 18 Nov 2011 16:41:38 -0000 1.49
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-java/icedtea
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.48 2011/11/18 11:01:45 sera Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.49 2011/11/18 16:41:38 caster Exp $
30 +
31 + 18 Nov 2011; Vlastimil Babka <caster@g.o> icedtea-6.1.10.4-r1.ebuild,
32 + icedtea-7.2.0-r1.ebuild:
33 + Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
34 + Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
35
36 18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
37 icedtea-7.2.0-r1.ebuild:
38
39
40
41 1.13 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.13&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.13&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.12&r2=1.13
46
47 Index: icedtea-7.2.0-r1.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
50 retrieving revision 1.12
51 retrieving revision 1.13
52 diff -u -r1.12 -r1.13
53 --- icedtea-7.2.0-r1.ebuild 18 Nov 2011 11:01:45 -0000 1.12
54 +++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 16:41:38 -0000 1.13
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2011 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.12 2011/11/18 11:01:45 sera Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.13 2011/11/18 16:41:38 caster Exp $
60 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
61
62 # *********************************************************
63 @@ -204,12 +204,12 @@
64 die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
65 fi
66
67 - # OpenJDK-specific parallelism support.
68 - procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
69 - if [[ -n ${procs} ]] ; then
70 - config="${config} --with-parallel-jobs=${procs}";
71 - einfo "Configuring using --with-parallel-jobs=${procs}"
72 - fi
73 + # OpenJDK-specific parallelism support. Bug #389791, #337827
74 + # Implementation modified from waf-utils.eclass
75 + # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
76 + local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
77 + config="${config} --with-parallel-jobs=${procs}";
78 + einfo "Configuring using --with-parallel-jobs=${procs}"
79
80 if use_zero ; then
81 config="${config} --enable-zero"
82
83
84
85 1.6 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.6&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.6&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.5&r2=1.6
90
91 Index: icedtea-6.1.10.4-r1.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
94 retrieving revision 1.5
95 retrieving revision 1.6
96 diff -u -r1.5 -r1.6
97 --- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 11:01:47 -0000 1.5
98 +++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 16:41:38 -0000 1.6
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2011 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.5 2011/11/18 11:01:47 sera Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.6 2011/11/18 16:41:38 caster Exp $
104 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
105
106 # *********************************************************
107 @@ -189,12 +189,12 @@
108 die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
109 fi
110
111 - # OpenJDK-specific parallelism support.
112 - procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
113 - if [[ -n ${procs} ]] ; then
114 - config="${config} --with-parallel-jobs=${procs}";
115 - einfo "Configuring using --with-parallel-jobs=${procs}"
116 - fi
117 + # OpenJDK-specific parallelism support. Bug #389791, #337827
118 + # Implementation modified from waf-utils.eclass
119 + # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
120 + local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
121 + config="${config} --with-parallel-jobs=${procs}";
122 + einfo "Configuring using --with-parallel-jobs=${procs}"
123
124 if use_zero ; then
125 config="${config} --enable-zero"
Report Message
Find on MARC Find on Google Groups