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"
