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 C1A5815808B for ; Tue, 1 Oct 2024 01:46:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA995E29C2; Tue, 1 Oct 2024 01:46:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 A4057E29C2 for ; Tue, 1 Oct 2024 01:46:47 +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 CFDB634300D for ; Tue, 1 Oct 2024 01:46:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 353011EF3 for ; Tue, 1 Oct 2024 01:46:45 +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: <1727747145.7a6f738a6e505b65bf7d9032810adccc419e9467.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: 7a6f738a6e505b65bf7d9032810adccc419e9467 X-VCS-Branch: master Date: Tue, 1 Oct 2024 01:46:45 +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: 1227d3ef-5fdc-404e-813f-45e6db3b92a1 X-Archives-Hash: e6a3618f8bbf328fee5b8cc17cfbae92 commit: 7a6f738a6e505b65bf7d9032810adccc419e9467 Author: Sam James gentoo org> AuthorDate: Tue Oct 1 01:45:16 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 1 01:45:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6f738a toolchain.eclass: further adaptations to dev-lang/ada-bootstrap This needs prettifying, which I'll do shortly. Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 648e67b9493b..f52ff0e6bb60 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -840,6 +840,7 @@ toolchain_setup_ada() { local ada_bootstrap local ada_candidate + local ada_bootstrap_type # GNAT can usually be built using the last major version and # the current version, at least. # @@ -852,6 +853,7 @@ toolchain_setup_ada() { ebegin "Testing sys-devel/gcc:${ada_candidate} for Ada" if has_version -b "sys-devel/gcc:${ada_candidate}[ada(-)]" ; then ada_bootstrap=${ada_candidate} + ada_bootstrap_type=gcc eend 0 break @@ -863,16 +865,15 @@ toolchain_setup_ada() { if ver_test ${ada_bootstrap} -gt ${PV} || [[ -z ${ada_bootstrap} ]] ; then ebegin "Testing fallback dev-lang/ada-bootstrap for Ada" if has_version -b " "${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 - export "${tool^^}"=${CBUILD}-${tool}-${ada_bootstrap} + export "${tool^^}"="${T}"/ada-wrappers/${tool} done - export PATH="${T}/ada-wrappers:${PATH}" + export PATH="${T}/ada-wrappers:${old_path}" export CC="$(tc-getCC) -specs=${T}/ada.spec" }