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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 849F0159C9B for ; Wed, 7 Aug 2024 03:03:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6D5FE2AED; Wed, 7 Aug 2024 03:03:39 +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 9F7ACE2AED for ; Wed, 7 Aug 2024 03:03:39 +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 D8AF9342DEF for ; Wed, 7 Aug 2024 03:03:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18A401EBA for ; Wed, 7 Aug 2024 03:03:37 +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: <1722999798.1a17266f16d4fbd2116611777a3c77f2db31bc8b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/rust-toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1a17266f16d4fbd2116611777a3c77f2db31bc8b X-VCS-Branch: master Date: Wed, 7 Aug 2024 03:03:37 +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: af294abf-6c05-49bf-803b-716d175c9b69 X-Archives-Hash: df1fbbc0efdd62ea91be106a1a7db50e commit: 1a17266f16d4fbd2116611777a3c77f2db31bc8b Author: Piotr Kubaj anongoth pl> AuthorDate: Tue Aug 6 12:31:27 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 7 03:03:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a17266f rust-toolchain.eclass: add powerpc*musl support Also adjust indentation. [sam: Note that this is easier to review with `git diff -w`.] Signed-off-by: Piotr Kubaj anongoth.pl> Closes: https://github.com/gentoo/gentoo/pull/35928 Signed-off-by: Sam James gentoo.org> eclass/rust-toolchain.eclass | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 111aece796ce..469479b849b3 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -31,26 +31,29 @@ esac rust_abi() { local CTARGET=${1:-${CHOST}} case ${CTARGET%%*-} in - aarch64*gnu) echo aarch64-unknown-linux-gnu;; - aarch64*musl) echo aarch64-unknown-linux-musl;; - armv6j*h*) echo arm-unknown-linux-gnueabihf;; - armv6j*s*) echo arm-unknown-linux-gnueabi;; - armv7a*h*) echo armv7-unknown-linux-gnueabihf;; - i?86*) echo i686-unknown-linux-gnu;; - loongarch64*) echo loongarch64-unknown-linux-gnu;; - mips64el*) echo mips64el-unknown-linux-gnuabi64;; - mips64*) echo mips64-unknown-linux-gnuabi64;; - mipsel*) echo mipsel-unknown-linux-gnu;; - mips*) echo mips-unknown-linux-gnu;; - powerpc64le*) echo powerpc64le-unknown-linux-gnu;; - powerpc64*) echo powerpc64-unknown-linux-gnu;; - powerpc*) echo powerpc-unknown-linux-gnu;; - riscv64*gnu) echo riscv64gc-unknown-linux-gnu;; - riscv64*musl) echo riscv64gc-unknown-linux-musl;; - s390x*) echo s390x-unknown-linux-gnu;; - x86_64*gnu) echo x86_64-unknown-linux-gnu;; - x86_64*musl) echo x86_64-unknown-linux-musl;; - *) echo ${CTARGET};; + aarch64*gnu) echo aarch64-unknown-linux-gnu;; + aarch64*musl) echo aarch64-unknown-linux-musl;; + armv6j*h*) echo arm-unknown-linux-gnueabihf;; + armv6j*s*) echo arm-unknown-linux-gnueabi;; + armv7a*h*) echo armv7-unknown-linux-gnueabihf;; + i?86*) echo i686-unknown-linux-gnu;; + loongarch64*) echo loongarch64-unknown-linux-gnu;; + mips64el*) echo mips64el-unknown-linux-gnuabi64;; + mips64*) echo mips64-unknown-linux-gnuabi64;; + mipsel*) echo mipsel-unknown-linux-gnu;; + mips*) echo mips-unknown-linux-gnu;; + powerpc64le*gnu) echo powerpc64le-unknown-linux-gnu;; + powerpc64le*musl) echo powerpc64le-unknown-linux-musl;; + powerpc64*gnu) echo powerpc64-unknown-linux-gnu;; + powerpc64*musl) echo powerpc64-unknown-linux-musl;; + powerpc*gnu) echo powerpc-unknown-linux-gnu;; + powerpc*musl) echo powerpc-unknown-linux-musl;; + riscv64*gnu) echo riscv64gc-unknown-linux-gnu;; + riscv64*musl) echo riscv64gc-unknown-linux-musl;; + s390x*) echo s390x-unknown-linux-gnu;; + x86_64*gnu) echo x86_64-unknown-linux-gnu;; + x86_64*musl) echo x86_64-unknown-linux-musl;; + *) echo ${CTARGET};; esac }