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 DC96E15808B for ; Tue, 1 Oct 2024 01:58:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C73B2E29C0; Tue, 1 Oct 2024 01:58:28 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AAEC7E29C0 for ; Tue, 1 Oct 2024 01:58:28 +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 B8545343193 for ; Tue, 1 Oct 2024 01:58:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2885E1EF3 for ; Tue, 1 Oct 2024 01:58:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1727747851.23575e7311a21db0aa2dac9b29c5baa4f172658d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 23575e7311a21db0aa2dac9b29c5baa4f172658d X-VCS-Branch: master Date: Tue, 1 Oct 2024 01:58:26 +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: 2953b6c9-1330-476d-811f-d592cea156ce X-Archives-Hash: f1f6a9f228119bb74caad819a65041e9 commit: 23575e7311a21db0aa2dac9b29c5baa4f172658d Author: Sam James gentoo org> AuthorDate: Tue Oct 1 01:49:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 1 01:57:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23575e73 toolchain.eclass: small ada-bootstrap tweaks * Don't try to do a PATH lookup for the wrappers for now; need to install more symlinks in ada-bootstrap, I think * Style tweaks Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 7a67951fb7ab..355d5e12b4b5 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -983,17 +983,18 @@ toolchain_setup_ada() { local tool for tool in gnat{,bind,chop,clean,kr,link,ls,make,name,prep} ; do if [[ ${ada_bootstrap_type} == ada-bootstrap ]] ; then - ln -s "${BROOT}"/usr/lib/ada-bootstrap/bin/${tool} "${T}"/ada-wrappers/${CBUILD}-${tool}-${ada_bootstrap} || die + ln -s "${BROOT}"/usr/lib/ada-bootstrap/bin/${tool} \ + "${T}"/ada-wrappers/${CBUILD}-${tool}-${ada_bootstrap} || die fi cat <<-EOF > "${T}"/ada-wrappers/${tool} || die - #!/bin/sh - exec $(type -P ${CBUILD}-${tool}-${ada_bootstrap}) -specs=${T}/ada.spec "\$@" - EOF - chmod +x "${T}"/ada-wrappers/${tool} || die + #!/bin/sh + exec ${CBUILD}-${tool}-${ada_bootstrap} --specs=${T}/ada.spec "\$@" + EOF export "${tool^^}"="${T}"/ada-wrappers/${tool} done + chmod +x "${T}"/ada-wrappers/gnat{,bind,chop,clean,kr,link,ls,make,name,prep} || die export PATH="${T}/ada-wrappers:${old_path}" export CC="$(tc-getCC) -specs=${T}/ada.spec"