[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     39866b0e5a7f40f48734b92bbe152c46f03c0104
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 13:50:34 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 13:50:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=39866b0e

dev-java/icedtea: Always disable PCH on PaX systems, bug #601016

I will add this to 7.2 when it supports disabling PCH in 7.2.7.0.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-java/icedtea/icedtea-3.3.0.ebuild       | 8 +++++++-
 dev-java/icedtea/icedtea-3.4.0_pre00.ebuild | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-java/icedtea/icedtea-3.3.0.ebuild 
b/dev-java/icedtea/icedtea-3.3.0.ebuild
index 627a43fd..121a5fbb 100644
--- a/dev-java/icedtea/icedtea-3.3.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.3.0.ebuild
@@ -285,6 +285,13 @@ src_configure() {
                config+=" --disable-ccache"
        fi
 
+       # PaX breaks pch, bug #601016
+       if use pch && ! host-is-pax; then
+               config+=" --enable-precompiled-headers"
+       else
+               config+=" --disable-precompiled-headers"
+       fi
+
        config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
        unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -315,7 +322,6 @@ src_configure() {
                $(use_enable doc docs) \
                $(use_enable kerberos system-kerberos) \
                $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-               $(use_enable pch precompiled-headers) \
                $(use_enable sctp system-sctp) \
                $(use_enable smartcard system-pcsc) \
                $(use_enable sunec) \

diff --git a/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild 
b/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild
index 4966d9c5..d9df712d 100644
--- a/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild
+++ b/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild
@@ -290,6 +290,13 @@ src_configure() {
                config+=" --disable-ccache"
        fi
 
+       # PaX breaks pch, bug #601016
+       if use pch && ! host-is-pax; then
+               config+=" --enable-precompiled-headers"
+       else
+               config+=" --disable-precompiled-headers"
+       fi
+
        config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
        unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -320,7 +327,6 @@ src_configure() {
                $(use_enable doc docs) \
                $(use_enable kerberos system-kerberos) \
                $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-               $(use_enable pch precompiled-headers) \
                $(use_enable sctp system-sctp) \
                $(use_enable smartcard system-pcsc) \
                $(use_enable sunec) \