From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- eclass/ada.eclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'eclass/ada.eclass') diff --git a/eclass/ada.eclass b/eclass/ada.eclass index 86a67fc24fd0..dad3d9acce85 100644 --- a/eclass/ada.eclass +++ b/eclass/ada.eclass @@ -6,6 +6,7 @@ # Ada team # @AUTHOR: # Tupone Alfredo +# @SUPPORTED_EAPIS: 6 7 # @BLURB: An eclass for Ada packages # @DESCRIPTION: # This eclass set the IUSE and REQUIRED_USE to request the ADA_TARGET @@ -221,6 +222,10 @@ ada_export() { export GCC_PV=${gcc_pv} debug-print "${FUNCNAME}: GCC_PV = ${GCC_PV}" ;; + GNAT) + export GNAT=${EPREFIX}/usr/bin/gnat-${gcc_pv} + debug-print "${FUNCNAME}: GNAT = ${GNAT}" + ;; GNATBIND) export GNATBIND=${EPREFIX}/usr/bin/gnatbind-${gcc_pv} debug-print "${FUNCNAME}: GNATBIND = ${GNATBIND}" @@ -404,9 +409,9 @@ ada_setup() { unset EADA if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - if use "ada_targets_${_ADA_SUPPORTED_IMPLS[0]}"; then + if use "ada_target_${_ADA_SUPPORTED_IMPLS[0]}"; then # Only one supported implementation, enable it explicitly - ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV + ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV GNAT GNATBIND GNATLS GNATMAKE ada_wrapper_setup fi else @@ -422,7 +427,7 @@ ada_setup() { die "More than one implementation in ADA_TARGET." fi - ada_export "${impl}" EADA GCC GCC_PV GNATMAKE + ada_export "${impl}" EADA GCC_PV GNAT GNATBIND GNATLS GNATMAKE ada_wrapper_setup fi done -- cgit v1.2.3