commit:     894446845c38eb1e23edbdee9b7bf11d7f069c15
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 07:38:00 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 08:26:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89444684

dev-lang/gnat-gpl: Fix case when ADA is specified without the path

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild 
b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index 77ac3e15dcd..2709a1c0990 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -57,10 +57,14 @@ GCC_A_FAKEIT="${P}-src.tar.gz
 
 pkg_setup() {
        GCC=${ADA:-$(tc-getCC)}
-       local path=$(dirname ${GCC})
        local base=$(basename ${GCC})
-       GNATMAKE="${path}/${base/gcc/gnatmake}"
-       GNATBIND="${path}/${base/gcc/gnatbind}"
+       GNATMAKE="${base/gcc/gnatmake}"
+       GNATBIND="${base/gcc/gnatbind}"
+       if [[ ${base} != ${GCC} ]] ; then
+               local path=$(dirname ${GCC})
+               GNATMAKE="${path}/${GNATMAKE}"
+               GNATBIND="${path}/${GNATBIND}"
+       fi
        if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
                eerror "You need a gcc compiler that provides the Ada Compiler:"
                eerror "1) use gcc-config to select the right compiler or"

Reply via email to