summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2022-10-07 20:37:40 +0200
committerAlfredo Tupone <tupone@gentoo.org>2022-10-07 20:37:40 +0200
commit7b614cbbb7514d643f8c0ca9173195c013c3c885 (patch)
treee6985dc63a8d52b5a138a1fb4edde6f297309c0e /dev-lang/gnat-gpl
parentdev-ada/gnatsymbolize: respect LDFLAGS (diff)
downloadgentoo-7b614cbbb7514d643f8c0ca9173195c013c3c885.tar.gz
gentoo-7b614cbbb7514d643f8c0ca9173195c013c3c885.tar.bz2
gentoo-7b614cbbb7514d643f8c0ca9173195c013c3c885.zip
dev-lang/gnat-gpl: do not use which
Closes: https://bugs.gentoo.org/844088 Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'dev-lang/gnat-gpl')
-rw-r--r--dev-lang/gnat-gpl/gnat-gpl-2020.ebuild14
-rw-r--r--dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild13
-rw-r--r--dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild12
3 files changed, 19 insertions, 20 deletions
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
index 7c3e1675fbdc..efc7ef0e3532 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -103,12 +103,12 @@ src_prepare() {
GNATLS="${gnatpath}/${GNATLS}"
fi
mkdir bin || die
- ln -s $(which ${GCC}) bin/gcc || die
- ln -s $(which ${CXX}) bin/g++ || die
- ln -s $(which ${GNATMAKE}) bin/gnatmake || die
- ln -s $(which ${GNATBIND}) bin/gnatbind || die
- ln -s $(which ${GNATLINK}) bin/gnatlink || die
- ln -s $(which ${GNATLS}) bin/gnatls || die
+ ln -s $(type -P ${GCC}) bin/gcc || die
+ ln -s $(type -P ${CXX}) bin/g++ || die
+ ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
+ ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
+ ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
+ ln -s $(type -P ${GNATLS}) bin/gnatls || die
cd ..
mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
index 02da8f27ec3a..7e9e65beb91e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
@@ -45,7 +45,6 @@ KEYWORDS="amd64 x86"
IUSE="+ada +bootstrap"
RESTRICT="test"
-RDEPEND="!~sys-devel/gcc-${TOOLCHAIN_GCC_PV}"
BDEPEND=sys-devel/binutils
S="${WORKDIR}"/${MYP}
@@ -106,12 +105,12 @@ src_prepare() {
GNATLS="${gnatpath}/${GNATLS}"
fi
mkdir bin || die
- ln -s $(which ${GCC}) bin/gcc || die
- ln -s $(which ${CXX}) bin/g++ || die
- ln -s $(which ${GNATMAKE}) bin/gnatmake || die
- ln -s $(which ${GNATBIND}) bin/gnatbind || die
- ln -s $(which ${GNATLINK}) bin/gnatlink || die
- ln -s $(which ${GNATLS}) bin/gnatls || die
+ ln -s $(type -P ${GCC}) bin/gcc || die
+ ln -s $(type -P ${CXX}) bin/g++ || die
+ ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
+ ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
+ ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
+ ln -s $(type -P ${GNATLS}) bin/gnatls || die
cd ..
mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
index 1d550e0fd45b..3634ffe8e48e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
@@ -103,12 +103,12 @@ src_prepare() {
GNATLS="${gnatpath}/${GNATLS}"
fi
mkdir bin || die
- ln -s $(which ${GCC}) bin/gcc || die
- ln -s $(which ${CXX}) bin/g++ || die
- ln -s $(which ${GNATMAKE}) bin/gnatmake || die
- ln -s $(which ${GNATBIND}) bin/gnatbind || die
- ln -s $(which ${GNATLINK}) bin/gnatlink || die
- ln -s $(which ${GNATLS}) bin/gnatls || die
+ ln -s $(type -P ${GCC}) bin/gcc || die
+ ln -s $(type -P ${CXX}) bin/g++ || die
+ ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
+ ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
+ ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
+ ln -s $(type -P ${GNATLS}) bin/gnatls || die
cd ..
mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die