From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1700300-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 043071581F0
for <garchives@archives.gentoo.org>; Sat, 14 Dec 2024 18:43:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DD6A3E09B7;
Sat, 14 Dec 2024 18:43:21 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9B5F9E09B7
for <gentoo-commits@lists.gentoo.org>; Sat, 14 Dec 2024 18:43:20 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 00631340C9C
for <gentoo-commits@lists.gentoo.org>; Sat, 14 Dec 2024 18:43:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EBC9AF5
for <gentoo-commits@lists.gentoo.org>; Sat, 14 Dec 2024 18:43:16 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1734201782.9c0077a62d40b6b7078ff75c883f3b33cd8ecca9.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: 9c0077a62d40b6b7078ff75c883f3b33cd8ecca9
X-VCS-Branch: master
Date: Sat, 14 Dec 2024 18:43:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0114a13d-a471-47c5-b595-bad12c8c8bed
X-Archives-Hash: b86c9f6a2bc38ba9b069803ea92b6d37
commit: 9c0077a62d40b6b7078ff75c883f3b33cd8ecca9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 18:41:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 18:43:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0077a6
toolchain.eclass: prepare for dev-lang/ada-bootstrap with diff version
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 51704a7f5fbf..6eef2a0ec03e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -971,12 +971,16 @@ toolchain_setup_ada() {
if ver_test ${ada_bootstrap} -gt ${PV} || [[ -z ${ada_bootstrap} ]] ; then
ebegin "Testing fallback dev-lang/ada-bootstrap for Ada"
if has_version -b "<dev-lang/ada-bootstrap-${SLOT}" ; then
- # TODO: Figure out ada-bootstrap versioning/slots
+ # Workaround the old scheme
+ if has_version -b "=dev-lang/ada-bootstrap-0_p2021*" ; then
+ ada_bootstrap=10
+ else
+ local latest_ada_bootstrap=$(best_version -b "<dev-lang/ada-bootstrap-${SLOT}")
+ latest_ada_bootstrap="${latest_ada_bootstrap#dev-lang/ada-bootstrap-}"
+ latest_ada_bootstrap=$(ver_cut 1 ${latest_ada_bootstrap})
+ ada_bootstrap="${latest_ada_bootstrap}"
+ fi
- #local latest_ada_bootstrap=$(best_version -b "<dev-lang/ada-bootstrap-${SLOT}")
- #latest_ada_bootstrap="${latest_ada_bootstrap#dev-lang/ada-bootstrap-}"
- #latest_ada_bootstrap=$(ver_cut 1 ${latest_ada_bootstrap})
- ada_bootstrap="10"
ada_bootstrap_type=ada-bootstrap
ada_bootstrap_bin_dir="${BROOT}/usr/lib/ada-bootstrap/bin"