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 B145A158020 for ; Sun, 13 Nov 2022 08:56:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1BFEE088B; Sun, 13 Nov 2022 08:56:38 +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 93FCFE088B for ; Sun, 13 Nov 2022 08:56:38 +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 8BB87335D73 for ; Sun, 13 Nov 2022 08:56:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E20E561C for ; Sun, 13 Nov 2022 08:56:35 +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: <1668329784.ea08395afda51ef7ffb6291c38266e888ce24c7c.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: ea08395afda51ef7ffb6291c38266e888ce24c7c X-VCS-Branch: master Date: Sun, 13 Nov 2022 08:56:35 +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: 85f1228a-a6a5-4ef5-b758-9380dcd2a0d1 X-Archives-Hash: 93e83da3a9a7e2532ea2fe5e3a4662b7 commit: ea08395afda51ef7ffb6291c38266e888ce24c7c Author: Alfredo Tupone gentoo org> AuthorDate: Sun Nov 13 08:51:03 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 13 08:56:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea08395a dev-lang/gnat-gpl: fix unbundling for x86 Closes: https://bugs.gentoo.org/881165 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild index 0ab2e943e258..c30a3ab46902 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild @@ -80,15 +80,18 @@ src_prepare() { fi if use bootstrap; then - rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ + 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 \ - "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ + "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/ld \ || die - rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/as \ || die ln -s /usr/bin/$CHOST-as \ - "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/as \ || die fi