From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F189515808B for ; Sun, 29 Sep 2024 11:28:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26B22E2A27; Sun, 29 Sep 2024 11:28:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C4FEE2A27 for ; Sun, 29 Sep 2024 11:28:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28A3434301F for ; Sun, 29 Sep 2024 11:28:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8C4DC36 for ; Sun, 29 Sep 2024 11:28:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1727609259.6c118fbbefc7ab5340c98179908fab2e6fca6b8a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6c118fbbefc7ab5340c98179908fab2e6fca6b8a X-VCS-Branch: master Date: Sun, 29 Sep 2024 11:28:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4547adae-2fb5-4371-8f6c-94ffcf132372 X-Archives-Hash: ae3184914d4215e87b8a7bd6d86505df commit: 6c118fbbefc7ab5340c98179908fab2e6fca6b8a Author: Sam James gentoo org> AuthorDate: Sun Sep 29 11:27:39 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 29 11:27:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c118fbb 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 gentoo.org> eclass/toolchain.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 62ff83feed28..138925777dd6 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