From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 442DA158094 for ; Fri, 7 Oct 2022 18:38:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45345E09CB; Fri, 7 Oct 2022 18:38:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CF29E09CB for ; Fri, 7 Oct 2022 18:38:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B215340E38 for ; Fri, 7 Oct 2022 18:38:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87EAA605 for ; Fri, 7 Oct 2022 18:38:13 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1665167860.7b614cbbb7514d643f8c0ca9173195c013c3c885.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/gnat-gpl-2020.ebuild dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 7b614cbbb7514d643f8c0ca9173195c013c3c885 X-VCS-Branch: master Date: Fri, 7 Oct 2022 18:38:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7d9de89-d5d8-4299-8e70-5bafb261bbea X-Archives-Hash: 6415c9336ed56a0a6bb06cda9c3b1ff5 commit: 7b614cbbb7514d643f8c0ca9173195c013c3c885 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Oct 7 18:37:40 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 7 18:37:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b614cbb dev-lang/gnat-gpl: do not use which Closes: https://bugs.gentoo.org/844088 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2020.ebuild | 14 +++++++------- dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild | 13 ++++++------- dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild | 12 ++++++------ 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