Fix CDS generation on hardened, bug #215225.

(Portage version: 2.1.4.4)

3 files changed, 19 insertions, 10 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 7148a8787549..ba282888d55b 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.231 2008/03/27 20:18:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.232 2008/03/28 23:11:01 caster Exp $
+
+  28 Mar 2008; Vlastimil Babka <caster@gentoo.org>
+  sun-jdk-1.5.0.15-r1.ebuild, sun-jdk-1.6.0.05-r1.ebuild:
+  Fix CDS generation on hardened, bug #215225.
 
 *sun-jdk-1.6.0.05-r1 (27 Mar 2008)
 *sun-jdk-1.5.0.15-r1 (27 Mar 2008)
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
index 6bac327f52a3..763d5865847c 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.2 2008/03/28 23:11:01 caster Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -43,6 +43,12 @@ JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
 
 src_unpack() {
 	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This needs to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
 
 	# see bug #207282
 	if use x86; then
@@ -54,10 +60,6 @@ src_unpack() {
 src_install() {
 	local dirs="bin include jre lib man"
 
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
 	dodir /opt/${P}
 
 	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
index 06cfa6e121d4..f747398e8abe 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.2 2008/03/28 23:11:01 caster Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -47,6 +47,12 @@ S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
 
 src_unpack() {
 	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This needs to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
 
 	# see bug #207282
 	if use x86; then
@@ -59,9 +65,6 @@ src_unpack() {
 src_install() {
 	local dirs="bin include jre lib man"
 
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
 
 	dodir /opt/${P}