| 1 |
commit: 39866b0e5a7f40f48734b92bbe152c46f03c0104 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 8 13:50:34 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 8 13:50:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=39866b0e |
| 7 |
|
| 8 |
dev-java/icedtea: Always disable PCH on PaX systems, bug #601016 |
| 9 |
|
| 10 |
I will add this to 7.2 when it supports disabling PCH in 7.2.7.0. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
| 13 |
|
| 14 |
dev-java/icedtea/icedtea-3.3.0.ebuild | 8 +++++++- |
| 15 |
dev-java/icedtea/icedtea-3.4.0_pre00.ebuild | 8 +++++++- |
| 16 |
2 files changed, 14 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/icedtea/icedtea-3.3.0.ebuild b/dev-java/icedtea/icedtea-3.3.0.ebuild |
| 19 |
index 627a43fd..121a5fbb 100644 |
| 20 |
--- a/dev-java/icedtea/icedtea-3.3.0.ebuild |
| 21 |
+++ b/dev-java/icedtea/icedtea-3.3.0.ebuild |
| 22 |
@@ -285,6 +285,13 @@ src_configure() { |
| 23 |
config+=" --disable-ccache" |
| 24 |
fi |
| 25 |
|
| 26 |
+ # PaX breaks pch, bug #601016 |
| 27 |
+ if use pch && ! host-is-pax; then |
| 28 |
+ config+=" --enable-precompiled-headers" |
| 29 |
+ else |
| 30 |
+ config+=" --disable-precompiled-headers" |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
config+=" --with-parallel-jobs=$(makeopts_jobs)" |
| 34 |
|
| 35 |
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS |
| 36 |
@@ -315,7 +322,6 @@ src_configure() { |
| 37 |
$(use_enable doc docs) \ |
| 38 |
$(use_enable kerberos system-kerberos) \ |
| 39 |
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ |
| 40 |
- $(use_enable pch precompiled-headers) \ |
| 41 |
$(use_enable sctp system-sctp) \ |
| 42 |
$(use_enable smartcard system-pcsc) \ |
| 43 |
$(use_enable sunec) \ |
| 44 |
|
| 45 |
diff --git a/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild b/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild |
| 46 |
index 4966d9c5..d9df712d 100644 |
| 47 |
--- a/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild |
| 48 |
+++ b/dev-java/icedtea/icedtea-3.4.0_pre00.ebuild |
| 49 |
@@ -290,6 +290,13 @@ src_configure() { |
| 50 |
config+=" --disable-ccache" |
| 51 |
fi |
| 52 |
|
| 53 |
+ # PaX breaks pch, bug #601016 |
| 54 |
+ if use pch && ! host-is-pax; then |
| 55 |
+ config+=" --enable-precompiled-headers" |
| 56 |
+ else |
| 57 |
+ config+=" --disable-precompiled-headers" |
| 58 |
+ fi |
| 59 |
+ |
| 60 |
config+=" --with-parallel-jobs=$(makeopts_jobs)" |
| 61 |
|
| 62 |
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS |
| 63 |
@@ -320,7 +327,6 @@ src_configure() { |
| 64 |
$(use_enable doc docs) \ |
| 65 |
$(use_enable kerberos system-kerberos) \ |
| 66 |
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ |
| 67 |
- $(use_enable pch precompiled-headers) \ |
| 68 |
$(use_enable sctp system-sctp) \ |
| 69 |
$(use_enable smartcard system-pcsc) \ |
| 70 |
$(use_enable sunec) \ |
Archives