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

Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@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 11:01:59
Message-Id: 20111118110147.3F3052004B@flycatcher.gentoo.org
1 sera 11/11/18 11:01:47
2
3 Modified: ChangeLog icedtea-7.2.0-r1.ebuild
4 icedtea-6.1.10.4-r1.ebuild
5 Log:
6 Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7. Bug #389751.
7
8 (Portage version: 2.1.10.35/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.48 dev-java/icedtea/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.48&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.48&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.47&r2=1.48
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
20 retrieving revision 1.47
21 retrieving revision 1.48
22 diff -u -r1.47 -r1.48
23 --- ChangeLog 13 Nov 2011 22:39:22 -0000 1.47
24 +++ ChangeLog 18 Nov 2011 11:01:45 -0000 1.48
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.47 2011/11/13 22:39:22 sera Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.48 2011/11/18 11:01:45 sera Exp $
30 +
31 + 18 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-6.1.10.4-r1.ebuild,
32 + icedtea-7.2.0-r1.ebuild:
33 + Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
34 + Bug #389751.
35
36 13 Nov 2011; Ralph Sennhauser <sera@g.o> icedtea-7.2.0-r1.ebuild:
37 Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
38
39
40
41 1.12 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.12&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.12&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.11&r2=1.12
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.11
51 retrieving revision 1.12
52 diff -u -r1.11 -r1.12
53 --- icedtea-7.2.0-r1.ebuild 13 Nov 2011 22:39:22 -0000 1.11
54 +++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 11:01:45 -0000 1.12
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.11 2011/11/13 22:39:22 sera Exp $
59 +# $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 $
60 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
61
62 # *********************************************************
63 @@ -170,9 +170,9 @@
64 }
65
66 java_prepare() {
67 - # Fix building with PaX enabled kernels. Bug #389751
68 + # Fix non bootstrap builds with PaX enabled kernels. Bug #389751
69 # Move applying test_gamma.patch to before creating boot copy.
70 - if grep '^PaX:' /proc/self/status > /dev/null; then
71 + if host-is-pax; then
72 sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die
73 sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die
74 export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch
75 @@ -187,10 +187,19 @@
76 local config procs rhino_jar
77 local vm=$(java-pkg_get-current-vm)
78
79 - if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]] ; then
80 + if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
81 # We can't currently bootstrap with a IcedTea6 JVM :(
82 config="${config} --disable-bootstrap"
83 - elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" && "${vm}" != "icedtea-bin-7" ]] ; then
84 + elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
85 + # We can't currently bootstrap with a PaX enabled kernel :(
86 + host-is-pax && config="${config} --disable-bootstrap"
87 + elif has "${vm}" gcj-jdk cacao; then
88 + if host-is-pax; then
89 + eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
90 + eerror "Sorry for the inconvenience"
91 + die "Use an existing IcedTea build instead or disable PaX on the host"
92 + fi
93 + else
94 eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
95 die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
96 fi
97
98
99
100 1.5 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.5&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.5&content-type=text/plain
104 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.4&r2=1.5
105
106 Index: icedtea-6.1.10.4-r1.ebuild
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
109 retrieving revision 1.4
110 retrieving revision 1.5
111 diff -u -r1.4 -r1.5
112 --- icedtea-6.1.10.4-r1.ebuild 10 Nov 2011 21:42:13 -0000 1.4
113 +++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 11:01:47 -0000 1.5
114 @@ -1,6 +1,6 @@
115 # Copyright 1999-2011 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.4 2011/11/10 21:42:13 sera Exp $
118 +# $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 $
119 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
120
121 # *********************************************************
122 @@ -177,10 +177,10 @@
123 local vmhome="/usr/lib/jvm/${vm}"
124
125 # IcedTea6 can't be built using IcedTea7; its class files are too new
126 - if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]]; then
127 + if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
128 # If we are upgrading icedtea, then we don't need to bootstrap.
129 config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
130 - elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
131 + elif has "${vm}" gcj-jdk cacao; then
132 # For other 1.5 JDKs e.g. GCJ, CACAO.
133 config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
134 config="${config} --with-jdk-home=${vmhome}"
Report Message
Find on MARC Find on Google Groups