commit: 578b05904e4db05655b7f7cf033847c68cf8ace3 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Aug 21 22:33:21 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Aug 21 22:33:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578b0590
toolchain.eclass: Fix gcj's automagic dependency on dev-java/antlr Closes: https://bugs.gentoo.org/552882 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> eclass/toolchain.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 06503b28f29..e8fa4d69412 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Maintainer: Toolchain Ninjas <toolch...@gentoo.org> @@ -1238,10 +1238,11 @@ toolchain_src_configure() { ### library options if tc_version_is_between 3.0 7.0 ; then - if ! is_gcj ; then + if is_gcj ; then + confgcc+=( --disable-gjdoc ) + use awt && confgcc+=( --enable-java-awt=gtk ) + else confgcc+=( --disable-libgcj ) - elif use awt ; then - confgcc+=( --enable-java-awt=gtk ) fi fi
