Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7. Bug #389751.

Package-Manager: portage-2.1.10.35/cvs/Linux x86_64

4 files changed, 26 insertions, 12 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 9ad5beef2869..6880e7002c64 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.47 2011/11/13 22:39:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.48 2011/11/18 11:01:45 sera Exp $
+
+  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+  icedtea-7.2.0-r1.ebuild:
+  Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
+  Bug #389751.
 
   13 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
   Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a94f5b0cba65..449596ab0d6b 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -17,7 +17,7 @@ DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.4-r1.ebuild 11119 RMD160 10bdec87cab8a8bc8ca1db3c41c41b22388bb81e SHA1 5fbd929337fb3b2f0107989022714ebcdb5cf760 SHA256 b32935f23be058836d42ced5d7dad3d42189fe3959394b8c43b94395c431c257
-EBUILD icedtea-7.2.0-r1.ebuild 11602 RMD160 49cd5288f8dcc8cac356cf76bcebd89f84eab01c SHA1 bfe7c813b933a147931ec2bc2e94e1907cad54d8 SHA256 a58d1ec40be3fb74bda539ef5f6f02f017e7e2c843024ee10ec853b849a90191
-MISC ChangeLog 9027 RMD160 3cb953a4bc1bb48dbdec62850de6117310d3b6d2 SHA1 725c8ef93249912ceea715011e58897f8619954b SHA256 a53491918793a0d64e1eb3c095551c9d9fb91da9801707be6aae4368ffaa22d9
+EBUILD icedtea-6.1.10.4-r1.ebuild 11040 RMD160 70eb9dbd86411720d8a52f3e2319edd47e2c8019 SHA1 c2ce27ec75193422c96b05d9223d0298beece190 SHA256 be094c62a02f5b9191131bf3b5f542ca832aac75a9f8afdd171c33c3ab95ed50
+EBUILD icedtea-7.2.0-r1.ebuild 11836 RMD160 3ba41050fe7b6c363f66ccc948d2f1beb9d0e809 SHA1 8c934175f843b6ec2a0adc5349620a2b6d6940be SHA256 f1c85ed8e7eac556fee159dfb6137519c0134c57c536a3197710a530e7801ad1
+MISC ChangeLog 9225 RMD160 3a21205f5ae88e06b92c0b91aedb9048d2a93dc6 SHA1 d9ded03202e04e9833fdfdfdc02bd868326b5d3a SHA256 991eac1697a60ee53a934445bc3aef660531467076596e6aa7cfcf742e174df0
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
index 1bed8fb474dc..57d65afb6ab9 100644
--- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -177,10 +177,10 @@ src_configure() {
 	local vmhome="/usr/lib/jvm/${vm}"
 
 	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]]; then
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
 		# If we are upgrading icedtea, then we don't need to bootstrap.
 		config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
-	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
+	elif has "${vm}" gcj-jdk cacao; then
 		# For other 1.5 JDKs e.g. GCJ, CACAO.
 		config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
 		config="${config} --with-jdk-home=${vmhome}"
diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index c5a46d693ce9..79a44cb2afd0 100644
--- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -170,9 +170,9 @@ src_unpack() {
 }
 
 java_prepare() {
-	# Fix building with PaX enabled kernels. Bug #389751
+	# Fix non bootstrap builds with PaX enabled kernels. Bug #389751
 	# Move applying test_gamma.patch to before creating boot copy.
-	if grep '^PaX:' /proc/self/status > /dev/null; then
+	if host-is-pax; then
 		sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die
 		sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die
 		export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch
@@ -187,10 +187,19 @@ src_configure() {
 	local config procs rhino_jar
 	local vm=$(java-pkg_get-current-vm)
 
-	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]] ; then
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
 		# We can't currently bootstrap with a IcedTea6 JVM :(
 		config="${config} --disable-bootstrap"
-	elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" && "${vm}" != "icedtea-bin-7" ]] ; then
+	elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
+		# We can't currently bootstrap with a PaX enabled kernel :(
+		host-is-pax && config="${config} --disable-bootstrap"
+	elif has "${vm}" gcj-jdk cacao; then
+		if host-is-pax; then
+			eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
+			eerror "Sorry for the inconvenience"
+			die "Use an existing IcedTea build instead or disable PaX on the host"
+		fi
+	else
 		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
 		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
 	fi