| 1 |
commit: 5210fe86600b6a29542ac4fa9bf708f27fc4c8dd |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 30 13:49:26 2021 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 30 13:49:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5210fe86 |
| 7 |
|
| 8 |
ada.eclass: SLOT has changed for gcc-10 and so for gnat-gpl-2021 |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/ada.eclass | 10 +++++++++- |
| 13 |
1 file changed, 9 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ada.eclass b/eclass/ada.eclass |
| 16 |
index 0c658368b52..1876a963496 100644 |
| 17 |
--- a/eclass/ada.eclass |
| 18 |
+++ b/eclass/ada.eclass |
| 19 |
@@ -198,27 +198,35 @@ ada_export() { |
| 20 |
debug-print "${FUNCNAME}: implementation: ${impl}" |
| 21 |
|
| 22 |
local gcc_pv |
| 23 |
+ local slot |
| 24 |
case "${impl}" in |
| 25 |
gnat_2016) |
| 26 |
gcc_pv=4.9.4 |
| 27 |
+ slot=4.9.4 |
| 28 |
;; |
| 29 |
gnat_2017) |
| 30 |
gcc_pv=6.3.0 |
| 31 |
+ slot=6.3.0 |
| 32 |
;; |
| 33 |
gnat_2018) |
| 34 |
gcc_pv=7.3.1 |
| 35 |
+ slot=7.3.1 |
| 36 |
;; |
| 37 |
gnat_2019) |
| 38 |
gcc_pv=8.3.1 |
| 39 |
+ slot=8.3.1 |
| 40 |
;; |
| 41 |
gnat_2020) |
| 42 |
gcc_pv=9.3.1 |
| 43 |
+ slot=9.3.1 |
| 44 |
;; |
| 45 |
gnat_2021) |
| 46 |
gcc_pv=10.3.1 |
| 47 |
+ slot=10 |
| 48 |
;; |
| 49 |
*) |
| 50 |
gcc_pv="9.9.9" |
| 51 |
+ slot=9.9.9 |
| 52 |
;; |
| 53 |
esac |
| 54 |
|
| 55 |
@@ -261,7 +269,7 @@ ada_export() { |
| 56 |
debug-print "${FUNCNAME}: GNATCHOP = ${GNATCHOP}" |
| 57 |
;; |
| 58 |
ADA_PKG_DEP) |
| 59 |
- ADA_PKG_DEP="dev-lang/gnat-gpl:${gcc_pv}" |
| 60 |
+ ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}" |
| 61 |
|
| 62 |
# use-dep |
| 63 |
if [[ ${ADA_REQ_USE} ]]; then |
Archives