From 6c118fbbefc7ab5340c98179908fab2e6fca6b8a Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 29 Sep 2024 12:27:39 +0100 Subject: [PATCH] toolchain.eclass: attempt to use gnat-gpl if the bootstrap GNAT is too new Bug: https://bugs.gentoo.org/880825 Signed-off-by: Sam James --- eclass/toolchain.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 62ff83feed284..138925777dd6b 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -891,7 +891,7 @@ toolchain_src_configure() { # As a last resort, use dev-lang/gnat-gpl. # TODO: Make gnat-gpl coinstallable with gcc:10. - if [[ -z ${ada_bootstrap} ]] ; then + if ver_test ${ada_bootstrap} -gt ${PV} || [[ -z ${ada_bootstrap} ]] ; then ebegin "Testing dev-lang/gnat-gpl for Ada" if has_version -b "dev-lang/gnat-gpl" ; then ada_bootstrap=10