[gentoo-commits] repo/gentoo:master commit in: eclass/

[Magnus Granberg]

commit:     4fb479392663b9ea66a8eee9ce39b085e9bd1427
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 22:55:07 2017 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 22:55:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb47939

toolchain.eclass: pax-mark java compiler #574808

 eclass/toolchain.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 0d8148f..f2b1a86 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1835,6 +1835,12 @@ toolchain_src_install() {
                pax-mark -r 
"${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1"
                pax-mark -r 
"${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus"
        fi
+       
+       # Disable MMROTECT so java works. #574808
+       if is_gcj ; then
+               pax-mark -m 
"${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/ecj1"
+               pax-mark -m 
"${D}${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}/gij"
+       fi
 }
 
 # Move around the libs to the right location.  For some reason,