| 1 |
commit: 578b05904e4db05655b7f7cf033847c68cf8ace3 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 21 22:33:21 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 21 22:33:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578b0590 |
| 7 |
|
| 8 |
toolchain.eclass: Fix gcj's automagic dependency on dev-java/antlr |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/552882 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/toolchain.eclass | 9 +++++---- |
| 14 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 17 |
index 06503b28f29..e8fa4d69412 100644 |
| 18 |
--- a/eclass/toolchain.eclass |
| 19 |
+++ b/eclass/toolchain.eclass |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Foundation |
| 22 |
+# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 26 |
@@ -1238,10 +1238,11 @@ toolchain_src_configure() { |
| 27 |
### library options |
| 28 |
|
| 29 |
if tc_version_is_between 3.0 7.0 ; then |
| 30 |
- if ! is_gcj ; then |
| 31 |
+ if is_gcj ; then |
| 32 |
+ confgcc+=( --disable-gjdoc ) |
| 33 |
+ use awt && confgcc+=( --enable-java-awt=gtk ) |
| 34 |
+ else |
| 35 |
confgcc+=( --disable-libgcj ) |
| 36 |
- elif use awt ; then |
| 37 |
- confgcc+=( --enable-java-awt=gtk ) |
| 38 |
fi |
| 39 |
fi |
Archives