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 4432F159C9B for ; Fri, 9 Aug 2024 09:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71189E2B3A; Fri, 9 Aug 2024 09:25:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5427CE2B3A for ; Fri, 9 Aug 2024 09:25:19 +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 74A4C335D64 for ; Fri, 9 Aug 2024 09:25:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA3D21B9A for ; Fri, 9 Aug 2024 09:25:16 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1723195423.27820f83ce65166c1bcec65cb35e9e17fcc2ff5e.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: eclass/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: eclass/toolchain-funcs.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 27820f83ce65166c1bcec65cb35e9e17fcc2ff5e X-VCS-Branch: master Date: Fri, 9 Aug 2024 09:25:16 +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: a379111e-064d-46c7-8d57-0f3b1f9cdb48 X-Archives-Hash: 578294c82edfca0b6e2ff4e5888f58e8 commit: 27820f83ce65166c1bcec65cb35e9e17fcc2ff5e Author: Fabian Groffen gentoo org> AuthorDate: Fri Aug 9 09:23:43 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Aug 9 09:23:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=27820f83 eclass/toolchain-funcs: return arch from tc-ninja_magic_to_arch For some reason Prefix has been returning whole keywords, but this doesn't seem to work very well on consumer, such as go-env.eclass Signed-off-by: Fabian Groffen gentoo.org> eclass/toolchain-funcs.eclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 5338dc6509..156e659aa3 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -653,15 +653,7 @@ tc-ninja_magic_to_arch() { [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} case ${host} in - powerpc-apple-darwin*) echo ppc-macos;; - x86_64-apple-darwin*) echo x64-macos;; - arm64-apple-darwin*) echo arm64-macos;; - sparc-sun-solaris*) echo sparc-solaris;; - sparcv9-sun-solaris*) echo sparc64-solaris;; - i?86-pc-solaris*) echo x86-solaris;; - x86_64-pc-solaris*) echo x64-solaris;; - i?86-pc-winnt*) echo x86-winnt;; - + arm64*) echo arm64;; aarch64*) echo arm64;; alpha*) echo alpha;; arc*) echo arc;; @@ -709,6 +701,7 @@ tc-ninja_magic_to_arch() { score*) echo score;; sh64*) _tc_echo_kernel_alias sh64 sh;; sh*) echo sh;; + sparcv9*) echo sparc64;; sparc64*) _tc_echo_kernel_alias sparc64 sparc;; sparc*) [[ ${PROFILE_ARCH} == "sparc64" ]] \ && _tc_echo_kernel_alias sparc64 sparc \