diff options
Diffstat (limited to 'eclass/ada.eclass')
| -rw-r--r-- | eclass/ada.eclass | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/eclass/ada.eclass b/eclass/ada.eclass index 2e409fd93050..1876a963496e 100644 --- a/eclass/ada.eclass +++ b/eclass/ada.eclass @@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup # @DESCRIPTION: # All supported Ada implementations, most preferred last. _ADA_ALL_IMPLS=( - gnat_2016 gnat_2017 gnat_2018 gnat_2019 gnat_2020 + gnat_2016 gnat_2017 gnat_2018 gnat_2019 gnat_2020 gnat_2021 ) readonly _ADA_ALL_IMPLS @@ -86,7 +86,7 @@ _ada_impl_supported() { gnat_201[6789]) return 0 ;; - gnat_2020) + gnat_202[01]) return 0 ;; *) @@ -184,7 +184,7 @@ ada_export() { impl=${1} shift ;; - gnat_2020) + gnat_202[01]) impl=${1} shift ;; @@ -198,24 +198,35 @@ ada_export() { debug-print "${FUNCNAME}: implementation: ${impl}" local gcc_pv + local slot case "${impl}" in gnat_2016) gcc_pv=4.9.4 + slot=4.9.4 ;; gnat_2017) gcc_pv=6.3.0 + slot=6.3.0 ;; gnat_2018) gcc_pv=7.3.1 + slot=7.3.1 ;; gnat_2019) gcc_pv=8.3.1 + slot=8.3.1 ;; gnat_2020) gcc_pv=9.3.1 + slot=9.3.1 + ;; + gnat_2021) + gcc_pv=10.3.1 + slot=10 ;; *) gcc_pv="9.9.9" + slot=9.9.9 ;; esac @@ -258,7 +269,7 @@ ada_export() { debug-print "${FUNCNAME}: GNATCHOP = ${GNATCHOP}" ;; ADA_PKG_DEP) - ADA_PKG_DEP="dev-lang/gnat-gpl:${gcc_pv}" + ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}" # use-dep if [[ ${ADA_REQ_USE} ]]; then |