Fix building with PaX enabled kernels. #422525

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

8 files changed, 111 insertions, 20 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/Manifest b/dev-java/icedtea/Manifest
index 10e725196c26..a752dab71505 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea-6-pass_javac_memory_args_to_vm.patch 2953 RMD160 1a7d83594b05c9e3560aaf634db46cea0ab1115a SHA1 6c2f07d14d1a2f48b10e1c2403f5438b2ef2c2c1 SHA256 39f2b68fea43923f88a6e1e4b8fe51735441e783da9cf2bbc9c95f4dea483763
-AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
+AUX icedtea-6_pax_kernel_support.patch 4862 RMD160 d9c2d96664b8e81ab3015f54e1f9abc354c2db64 SHA1 3a820a0a43e41d17fbe91131e74c78470cd2ef5f SHA256 7e9235d5f2b70b3e70c0940d35dc312fa59444e763eb5f521f2b71f86a24f70b
 AUX icedtea-7-compile_for_7_cacao_mem.patch 3414 RMD160 f2557792a3a39be8288626d6ca73a2a1bd45f9e4 SHA1 de71d3d77a6ab4b8b9aca9638db18260af3879ab SHA256 0ace12a18f471ddec1412e4eea999a5b38dca0dd653b2a8f0bc80449380c77eb
 AUX icedtea-7-compiler_detection_cleanup.patch 6833 RMD160 c9f0a6f50f22472fc7feb423da7ef432436d3c37 SHA1 ff0356d043cfe0c5c5ed1b27bd6bfd41548b00d5 SHA256 406fccc762d84cb73bb2ef7f934e770a88d82ead45eed860135b4571a6b3a91a
 AUX icedtea-7-no_suffix.patch 833 RMD160 d3d7b659c9b4de33d8b90cfd82d291d489b2feea SHA1 0b0aa2755d4aaf350d33a5a405974a1e5763dbe8 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8
 AUX icedtea-7.2.0-explicit-gthread.patch 696 RMD160 cda560809998da7925be2da896b34ba60f46b835 SHA1 8764b20bd736ac6c8ca7a061d48b1faac57ee26e SHA256 78e55b212004127726c8f0ab02b8a0a1c01677443237505a21fb803b38e08c55
 AUX icedtea-7.2.0_pax_kernel_support.patch 6511 RMD160 ca6ff5d7f8c1157558af28ef631ed4fd5f67f901 SHA1 538bb29bc10978ae14114cfed525c3905e808984 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e
+AUX icedtea-7.2.1.1-pax_mark_rmic_java.patch 963 RMD160 07ed36c1bbe35305e0cf10f22d11e0e522ad9cd1 SHA1 69b153f4baefbf0daaf28dec34540b4aba2c7940 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb
 AUX icedtea-7.2.1.1-pr986-cacao_memory_fix.patch 6342 RMD160 cb7a6be3aab4727f97cf3acc0cc0f91f35e481af SHA1 925f723081083c087739f0c3a2dea6a513eb2362 SHA256 5ad35a62ceb49215631d7d91b8e610598110d4b935140c5498b76f9a697cab3f
 AUX icedtea-7.2.2-no_suffix.patch 833 RMD160 d3d7b659c9b4de33d8b90cfd82d291d489b2feea SHA1 0b0aa2755d4aaf350d33a5a405974a1e5763dbe8 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8
+AUX icedtea-7.2.2.1-pax_mark_rmic_java.patch 963 RMD160 07ed36c1bbe35305e0cf10f22d11e0e522ad9cd1 SHA1 69b153f4baefbf0daaf28dec34540b4aba2c7940 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb
 AUX icedtea-7.2.2.1-pr986-cacao_memory_fix.patch 7401 RMD160 d05f499299056f939fd97e34fc01ef8b8becb707 SHA1 5673e1f53ce9cbc1a5fe2649dbce007d41ed870d SHA256 e2060ed9acf9ae9da8943ffec470b09745d758c6c6de8ac06737ea26eef21795
 AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
 DIST 0036fe6fe7dc.tar.gz 3971078 RMD160 d7a3e888cf52fa028c52d503eb6e23637b5ca50c SHA1 bebb3c056e314e650838f1a221782eb8ace8f850 SHA256 245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2
@@ -53,21 +55,21 @@ DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1
 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 RMD160 eef414a11dbcaafd2f830ca34227a869a1af1033 SHA1 e5e86fd4be4c58f8820893437e5e95cff083e757 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da114b986336e106cba16c SHA1 5d6fe1e3ef84d6699bff18eabf109e63d6c0a1c3 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
 EBUILD icedtea-6.1.11.2.ebuild 9965 RMD160 7f6708399f88ef3f466771b51d3b5f2fdcfa4416 SHA1 24c82e8fb2e0466a61df24629f63d63bd3afe50f SHA256 33c05dcaa376bcd598eccd3d942f98b854d2c1e8d95c56629b8f282387729366
-EBUILD icedtea-6.1.11.3.ebuild 10603 RMD160 241ded5896f9f0c3ec06ddda0509d59dd21ab9e0 SHA1 b17bda0d51530e2028a2caa48b35d6b1e5bf5d65 SHA256 1eedd898a827d4bc4620718c666d45211155f471c4569bdf0f10236947e87600
-EBUILD icedtea-7.2.1.1.ebuild 11070 RMD160 d53c23730a30796e7f52c633f5972433041ba285 SHA1 28564e432a09708830816dfa24ac5519d0b52742 SHA256 ce5790b41c5218941c29b5a00b368b13856c8caa3b4d84afcbba92f367154248
+EBUILD icedtea-6.1.11.3.ebuild 10611 RMD160 8bf4d72df8f9c21cc8ce7a215817e6059499cc4d SHA1 25827cda31117e70b3e24ba5c3093712b7e7d889 SHA256 dc98226f09f0d5533afab8ead191966ec5e33d0cb0bdbeec14871a62f1600f43
+EBUILD icedtea-7.2.1.1.ebuild 11129 RMD160 25d51d88839bc62d432d594bff9e8d8f083ed5f4 SHA1 1ceaf8fa79e0a088b3257dfbf20074c073175d0b SHA256 c1ab2a1dd5e22951dbc6f59661ebb1d35659cb64d85793af1d1a6b16119d15a5
 EBUILD icedtea-7.2.1.ebuild 10768 RMD160 fb68994569b8beae51acf3bf9c71a86ca3ddac17 SHA1 d3006641de4f5fc7371322d6b5cc28ef23667ea7 SHA256 8dce1934db92cf728673fcfb12462e1e2852c9e5209d286b3bb80d32f551c364
-EBUILD icedtea-7.2.2.1.ebuild 11038 RMD160 6cd9e205ea14f83cb1df95ba56e263951359102c SHA1 f58b6b9367b17f739d79337dc452b8aae77fc929 SHA256 9f38554316bb574f7f4d48020278b01aa8df15c0d62e2a9f63e3485f6946cb12
+EBUILD icedtea-7.2.2.1.ebuild 11098 RMD160 872ff095c8825d21aad384be2853aa761a56e26d SHA1 a14900c14cc1696036eba68e1d2c52c940be1506 SHA256 66517c084ffbca7cfe6852f85e14a515a9f85879082055189c796aed45010f0c
 EBUILD icedtea-7.2.2.ebuild 10670 RMD160 75b0c1de22c40de033fc9c9f36d4347c0819d3bf SHA1 76346be838c487595a21bb59ba0791f53c563397 SHA256 c05c67f616b5354f09d9aa43a254c15fd56db22dde9a7661d9d86e0a1eee7127
-MISC ChangeLog 16854 RMD160 bbbf12f356cbd8d77c6adbd2046212fb30828746 SHA1 7262467fea3cddfbfce2f8afdb6a626ad83562e6 SHA256 a3c82cfed1451b666981f2be1baf2d9966ab1850a6da8b2b5076ce81334049b5
+MISC ChangeLog 17173 RMD160 5f115b848819e46a069e8051f47bd1a1fc5d04d9 SHA1 2392f4f8884cba609bce0b5223c6ce94ec2f21d2 SHA256 7401e29fc25683a9afd6f3d17c874d75b5370bf863ed2392f8fa8bc92794fc00
 MISC metadata.xml 1493 RMD160 9fe0b22ca2efe63fb3b21b9d61fc9e51a783813f SHA1 50dfbf2c63b4d34e1f5ea818a3285dac788a1372 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP4OjxAAoJEIUJ+svaV163Kx0H/22pDkrQKb5FtvMkwaIqU3pF
-2rJcixEvtz4p4SpxNRhzkdkUwf1jDZ3A90UFlwUKsinMAOZ3EF2f6UqiRRHpqr/+
-yEiEj9Wk9e5RX0Z6SB0lNb4bVE/AOkiY640kIVfIJAJwfyvKOr8m8UrLV3uuHUeZ
-U2J9HDCQryO+Q/uYaxSmxXNprNNwJILb44e8rPKYj6rrcAPScuKTih5fN99uM7jY
-3wtbcQV9JWqKvlIpG/gEoW7QuP/1GkaQ5LZMONEylbnexgqrnkg+LJK2g5j5mUYA
-kEWTU9ZJ6haYzjBPhscR05JODFGVzULPnC7zuKjY+4nHi9YolS6f8l4wp9OCyOg=
-=PZYr
+iQEcBAEBAgAGBQJP5s2yAAoJEIUJ+svaV163FOAH/A7lZPjmgO06LN12JbOwBV9d
+6bKa9Z2IgeuDrvVC5ZEPhImHXI/9Aop+i2rGb4V78vq1R3S2d0tIZZKJ87DEmQZF
+WbiqN9hi6T1szvA6OtJKLArS9/yqaVTDiDIb6n32GBI4pk4ng5KmxcVgposop8F9
+8PNhb4rPaCRUbt0QseLs8PS0wCSbSMegrlerWMU6BIqYUd8iv6GSh3i5qdoZOWGS
+qlB/sbTadKQPG5GRegxyaQqdgeExd3dQ7yWGVhXRB5QKNBe5W83tyT86OLIaomg6
++CqALXkQiNmtzRhWHwM6DLCpA6YK4vI52VwsQqCPx+d+rQXrO9lc4tw3oyvPmIU=
+=/PK/
 -----END PGP SIGNATURE-----
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
 }