commit: ccb03cfb965f037c1a2d45ad2978bfac21fd78e2
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 06:27:30 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 06:29:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb03cfb
add gcc:13 support for ada packages
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
eclass/ada.eclass | 19 ++++++++-----------
profiles/arch/x86/use.stable.mask | 4 ----
profiles/base/use.stable.mask | 4 ----
profiles/desc/ada_target.desc | 1 +
4 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index a5cb9b297ee5..e5b62951917a 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -57,7 +57,7 @@ _ADA_ECLASS=1
# @DESCRIPTION:
# All supported Ada implementations, most preferred last.
_ADA_ALL_IMPLS=(
- gnat_2021 gcc_12
+ gnat_2021 gcc_12 gcc_13
)
readonly _ADA_ALL_IMPLS
@@ -119,10 +119,7 @@ _ada_impl_supported() {
# keep in sync with _ADA_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- gnat_2021)
- return 0
- ;;
- gcc_12)
+ gnat_2021|gcc_12|gcc_13)
return 0
;;
*)
@@ -216,11 +213,7 @@ ada_export() {
local impl var
case "${1}" in
- gnat_2021)
- impl=${1}
- shift
- ;;
- gcc_12)
+ gnat_2021|gcc_12|gcc_13)
impl=${1}
shift
;;
@@ -244,6 +237,10 @@ ada_export() {
gcc_pv=12
slot=12
;;
+ gcc_13)
+ gcc_pv=13
+ slot=13
+ ;;
*)
gcc_pv="9.9.9"
slot=9.9.9
@@ -293,7 +290,7 @@ ada_export() {
gnat_2021)
ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}[ada]"
;;
- gcc_12)
+ gcc_12|gcc_13)
ADA_PKG_DEP="sys-devel/gcc:${slot}[ada]"
;;
*)
diff --git a/profiles/arch/x86/use.stable.mask
b/profiles/arch/x86/use.stable.mask
index 5b5cab87da95..29e2b97d388e 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Alfredo Tupone <tup...@gentoo.org> (2023-2-2)
-# sys-devel/gcc:12 is not stable yet on x86
-ada_target_gcc_12
-
# Sam James <s...@gentoo.org> (2020-11-10)
# media-gfx/openvdb is not stable on x86
# ... and has failing tests right now anyway
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 081309139fbd..1afeb5e46110 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -17,10 +17,6 @@ python_single_target_python3_12
# PHP 8.2 is in testing
php_targets_php8-2
-# Alfredo Tupone <tup...@gentoo.org> (2022-12-04)
-# sys-devel/gcc:12 is not stable yet
-ada_target_gcc_12_2_0
-
# Sergei Trofimovich <sly...@gentoo.org> (2020-04-13)
# dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
darcs
diff --git a/profiles/desc/ada_target.desc b/profiles/desc/ada_target.desc
index 3b4430fae688..005be2d73640 100644
--- a/profiles/desc/ada_target.desc
+++ b/profiles/desc/ada_target.desc
@@ -3,3 +3,4 @@
gnat_2021 - Compile with dev-lang/gnat-gpl-2021
gcc_12 - Compile with sys-devel/gcc:12
+gcc_13 - Compile with sys-devel/gcc:13
