Fix building with PaX enabled kernels. #422525

(Portage version: 2.1.10.65/cvs/Linux x86_64)

7 files changed, 97 insertions, 8 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 1b5cd6d25f8c..7b92121c0e52 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.76 2012/06/19 21:02:24 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.77 2012/06/24 08:19:48 sera Exp $
+
+  24 Jun 2012; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.11.3.ebuild,
+  files/icedtea-6_pax_kernel_support.patch, icedtea-7.2.1.1.ebuild,
+  +files/icedtea-7.2.1.1-pax_mark_rmic_java.patch, icedtea-7.2.2.1.ebuild,
+  +files/icedtea-7.2.2.1-pax_mark_rmic_java.patch:
+  Fix building with PaX enabled kernels. #422525
 
   19 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-6.1.10.6.ebuild,
   -icedtea-6.1.11.1.ebuild, -files/icedtea-6.1.11.1-cacao_jvm.cfg.patch,
diff --git a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
index 804692510847..97ca435d041a 100644
--- a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
+++ b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
@@ -12,15 +12,19 @@ diff --git a/Makefile.am b/Makefile.am
 index 82ef261..e17fa5f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -421,7 +421,7 @@ else
+@@ -421,8 +421,10 @@ else
  ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
  endif
  
 -if HAS_PAX
+-ICEDTEA_PATCHES += patches/no-test_gamma.patch
 +if WITH_PAX
- ICEDTEA_PATCHES += patches/no-test_gamma.patch
++ICEDTEA_PATCHES += \
++	patches/no-test_gamma.patch \
++	patches/pax-mark-rmic-java.patch
  endif
  
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
 @@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
  endif
  endif
@@ -141,3 +145,19 @@ index 0000000..bdff735
 +               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
 +       done
 +fi
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
++++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
++--- openjdk/jdk/make/com/sun/jmx/Makefile
+++++ openjdk/jdk/make/com/sun/jmx/Makefile
++@@ -119,6 +119,7 @@
++ 
++ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
++ 	$(prep-target)
+++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
++ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
++                 -d $(CLASSDESTDIR)              \
++                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
new file mode 100644
index 000000000000..c66525332b00
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index 49d8bc4..85ac971 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+ if WITH_PAX
+-ICEDTEA_PATCHES += patches/test_gamma.patch
++ICEDTEA_PATCHES += \
++	patches/test_gamma.patch \
++	patches/pax-mark-rmic-java.patch
+ endif
+ 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
++++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
++--- openjdk/jdk/make/com/sun/jmx/Makefile
+++++ openjdk/jdk/make/com/sun/jmx/Makefile
++@@ -119,6 +119,7 @@
++ 
++ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
++ 	$(prep-target)
+++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
++ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
++                 -d $(CLASSDESTDIR)              \
++                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
new file mode 100644
index 000000000000..c66525332b00
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index 49d8bc4..85ac971 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+ if WITH_PAX
+-ICEDTEA_PATCHES += patches/test_gamma.patch
++ICEDTEA_PATCHES += \
++	patches/test_gamma.patch \
++	patches/pax-mark-rmic-java.patch
+ endif
+ 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
++++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
++--- openjdk/jdk/make/com/sun/jmx/Makefile
+++++ openjdk/jdk/make/com/sun/jmx/Makefile
++@@ -119,6 +119,7 @@
++ 
++ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
++ 	$(prep-target)
+++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
++ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
++                 -d $(CLASSDESTDIR)              \
++                 -v1.2                           \
diff --git a/dev-java/icedtea/icedtea-6.1.11.3.ebuild b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
index 30526f5da59f..c8a5d84aea36 100644
--- a/dev-java/icedtea/icedtea-6.1.11.3.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -142,7 +142,7 @@ java_prepare() {
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
 
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 #422525
 	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
 	eautoreconf
 }
diff --git a/dev-java/icedtea/icedtea-7.2.1.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
index ee8c645b3f32..d795b20cd88c 100644
--- a/dev-java/icedtea/icedtea-7.2.1.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -162,7 +162,7 @@ java_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
 	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-
+	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
 	eautoreconf
 }
 
diff --git a/dev-java/icedtea/icedtea-7.2.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
index f9f0aa35bee5..dc4654136edc 100644
--- a/dev-java/icedtea/icedtea-7.2.2.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -162,6 +162,7 @@ java_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
 	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
+	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
 	eautoreconf
 }