From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 4C4431582EF for ; Wed, 19 Feb 2025 07:23:26 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 33C1D3431F4 for ; Wed, 19 Feb 2025 07:23:26 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id EF517110485; Wed, 19 Feb 2025 07:21:44 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 31AB611047C for ; Wed, 19 Feb 2025 07:21:44 +0000 (UTC) Received: from monolith.infra.footclan.ninja (119-18-36-251.771224.bne.static.aussiebb.net [119.18.36.251]) (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) (Authenticated sender: kangie@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 21104342FA3; Wed, 19 Feb 2025 07:21:42 +0000 (UTC) From: kangie@gentoo.org To: gentoo-dev@lists.gentoo.org Cc: Matt Jolly Subject: [gentoo-dev] [PATCH 1/2] rust-toolchain.eclass: simplify `rust_all_arch_uris` Date: Wed, 19 Feb 2025 17:21:23 +1000 Message-ID: <20250219072124.302580-2-kangie@gentoo.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250219072124.302580-1-kangie@gentoo.org> References: <20250219072124.302580-1-kangie@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 4caf27e0-e7c5-4be3-85c7-6f5d5a59faac X-Archives-Hash: f225b180c208c08db5fa2751e5faf1fe From: Matt Jolly The `mips` logic has been moved into the one ebuild that it impacts, and that ebuild is only required for one package - we'll try to remove it from the tree soon. Merge `loong` into `rust_all_arch_uris()` output unconditionally; the check is now superfluous - all pre-1.71.0 rust versions are out of the tree. Signed-off-by: Matt Jolly --- eclass/rust-toolchain.eclass | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 89bca88b9e6b..2d9c56b4d6b6 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rust-toolchain.eclass @@ -113,29 +113,6 @@ rust_all_arch_uris() ) riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) ) s390? ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) ) + loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") ) ) " - - # Upstream did not gain support for loong until v1.71.0. - # NOTE: Merge this into the block above after every <1.71.0 version is - # gone from tree. - local arg_version="${1##*-}" - arg_version="${arg_version:-$PV}" - if ver_test "${arg_version}" -ge 1.71.0; then - echo "loong? ( elibc_glibc? ( $(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 } -- 2.48.0