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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7612158020 for ; Wed, 16 Nov 2022 13:17:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBB9AE086D; Wed, 16 Nov 2022 13:17:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 BB87CE086D for ; Wed, 16 Nov 2022 13:17:11 +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 92145340F28 for ; Wed, 16 Nov 2022 13:17:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2E0D72C for ; Wed, 16 Nov 2022 13:17:08 +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: <1668604544.8329f0f2a047ebf3d7c46b86987ec881b394b96c.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-2021-r4.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 8329f0f2a047ebf3d7c46b86987ec881b394b96c X-VCS-Branch: master Date: Wed, 16 Nov 2022 13:17:08 +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: 4045ec0e-bf78-46ea-950e-3756b92a88bd X-Archives-Hash: 9a7f7cccca38b0fe098f3b4eed62ddcb commit: 8329f0f2a047ebf3d7c46b86987ec881b394b96c Author: Alfredo Tupone gentoo org> AuthorDate: Wed Nov 16 13:15:44 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 16 13:15:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8329f0f2 dev-lang/gnat-gpl: use architecture specific name for bootstrap Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild index 09374e55ce58..c90d5ac44036 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild @@ -79,10 +79,10 @@ src_prepare() { die "ada compiler not available" fi + local bundledchost="" + use amd64 && local bundledchost="x86_64" + use x86 && local bundledchost="i686" if use bootstrap; then - local bundledchost="" - use amd64 && local bundledchost="x86_64" - use x86 && local bundledchost="i686" rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/ld \ || die ln -s /usr/bin/$CHOST-ld \ @@ -113,6 +113,12 @@ src_prepare() { ln -s $(type -P ${GNATBIND}) bin/gnatbind || die ln -s $(type -P ${GNATLINK}) bin/gnatlink || die ln -s $(type -P ${GNATLS}) bin/gnatls || die + ln -s $(type -P ${GCC}) bin/${bundledchost}-pc-linux-gnu-gcc || die + ln -s $(type -P ${CXX}) bin/${bundledchost}-pc-linux-gnu-g++ || die + ln -s $(type -P ${GNATMAKE}) bin/${bundledchost}-pc-linux-gnu-gnatmake || die + ln -s $(type -P ${GNATBIND}) bin/${bundledchost}-pc-linux-gnu-gnatbind || die + ln -s $(type -P ${GNATLINK}) bin/${bundledchost}-pc-linux-gnu-gnatlink || die + ln -s $(type -P ${GNATLS}) bin/${bundledchost}-pc-linux-gnu-gnatls || die cd .. mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die