diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /eclass/ada.eclass | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'eclass/ada.eclass')
| -rw-r--r-- | eclass/ada.eclass | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/eclass/ada.eclass b/eclass/ada.eclass index 683417c6afe0..6089ed6e737f 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_2017 gnat_2018 gnat_2019 gnat_2020 gnat_2021 + gnat_2019 gnat_2020 gnat_2021 ) readonly _ADA_ALL_IMPLS @@ -83,7 +83,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_201[789]) + gnat_2019) return 0 ;; gnat_202[01]) @@ -200,14 +200,6 @@ ada_export() { local gcc_pv local slot case "${impl}" in - 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 @@ -287,7 +279,7 @@ _ada_single_set_globals() { local flags=( "${_ADA_SUPPORTED_IMPLS[@]/#/ada_target_}" ) local unflags=( "${_ADA_UNSUPPORTED_IMPLS[@]/#/-ada_target_}" ) - local allflags=( ${flags[@]} ${unflags[@]} ) + local allflags=( "${_ADA_ALL_IMPLS[@]/#/ada_target_}" ) local optflags=${flags[@]/%/(-)?} |