commit: 7010b055a0051e6557cfd2ef644e432fe84dc388
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 21:49:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 13 21:51:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7010b055
toolchain.eclass: don't depend on self if gnat-gpl
Without this, we get:
```
* Error: circular dependencies:
(sys-devel/gcc-13.2.1_p20240210:13/13::gentoo, ebuild scheduled for merge)
depends on
(dev-lang/gnat-gpl-2021-r5:10/10::gentoo, ebuild scheduled for merge)
(buildtime)
(sys-devel/gcc-13.2.1_p20240210:13/13::gentoo, ebuild scheduled for merge)
(buildtime)
```
Reported on IRC by dormito.
Fixes: 74414ea0c4d70c96bbec234df290d7e5f14d8f51
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 25dedd4e5262..7d69f3b90e91 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -393,7 +393,7 @@ fi
# TODO: Add a pkg_setup & pkg_pretend check for whether the active compiler
# supports Ada.
-if tc_has_feature ada ; then
+if [[ ${PN} != gnat-gpl ]] && tc_has_feature ada ; then
BDEPEND+=" ada? ( || ( sys-devel/gcc[ada] dev-lang/gnat-gpl[ada] ) )"
fi