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 CA04615800A for ; Mon, 28 Aug 2023 06:54:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB16C2BC075; Mon, 28 Aug 2023 06:54:50 +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 AFF302BC075 for ; Mon, 28 Aug 2023 06:54:50 +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 E0BB0340D2A for ; Mon, 28 Aug 2023 06:54:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D5DD10C7 for ; Mon, 28 Aug 2023 06:54:48 +0000 (UTC) From: "WANG Xuerui" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "WANG Xuerui" Message-ID: <1693205512.f66c64d25bc04fc2ef3bd3cba6a8fbc48f42be9f.xen0n@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: xen0n X-VCS-Committer-Name: WANG Xuerui X-VCS-Revision: f66c64d25bc04fc2ef3bd3cba6a8fbc48f42be9f X-VCS-Branch: master Date: Mon, 28 Aug 2023 06:54:48 +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: e0481e99-92d3-456f-8f97-bb367ea086d2 X-Archives-Hash: b4ba3a1a1aecf102a9072d28f2c0988f commit: f66c64d25bc04fc2ef3bd3cba6a8fbc48f42be9f Author: WANG Xuerui gentoo org> AuthorDate: Sat Aug 26 07:31:50 2023 +0000 Commit: WANG Xuerui gentoo org> CommitDate: Mon Aug 28 06:51:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66c64d2 rust-toolchain.eclass: exclude mips from SRC_URI for versions >= 1.72.0 Upstream dropped the mips*-linux-gnu* targets to Tier 3, so until the situation is resolved there will not be prebuilt binaries from upstream. Signed-off-by: WANG Xuerui gentoo.org> eclass/rust-toolchain.eclass | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index f4451f743596..5824a48734f9 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -122,16 +122,6 @@ rust_all_arch_uris() elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") ) ) - mips? ( - abi_mips_o32? ( - big-endian? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") ) - !big-endian? ( $(rust_arch_uri mipsel-unknown-linux-gnu "$@") ) - ) - abi_mips_n64? ( - big-endian? ( $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) - !big-endian? ( $(rust_arch_uri mips64el-unknown-linux-gnuabi64 "$@") ) - ) - ) ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) ppc64? ( big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) @@ -145,7 +135,23 @@ rust_all_arch_uris() # NOTE: Merge this into the block above after every <1.71.0 version is # gone from tree. local arg_version="${1##*-}" - if ver_test "${arg_version:-$PV}" -ge 1.71.0; then + arg_version="${arg_version:-$PV}" + if ver_test "${arg_version}" -ge 1.71.0; then echo "loong? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") )" fi + + # until https://github.com/rust-lang/rust/pull/113274 is resolved, there + # will not be upstream-built mips artifacts + if ver_test "${arg_version}" -lt 1.72.0; then + echo "mips? ( + abi_mips_o32? ( + big-endian? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") ) + !big-endian? ( $(rust_arch_uri mipsel-unknown-linux-gnu "$@") ) + ) + abi_mips_n64? ( + big-endian? ( $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) + !big-endian? ( $(rust_arch_uri mips64el-unknown-linux-gnuabi64 "$@") ) + ) + )" + fi }