From c3d19db937cdf7db63bd49bb5647f48fb4fad2e4 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 17 Oct 2023 16:52:00 +0200 Subject: [PATCH] portage eclass: sync rust-toolchain.eclass Get rust-toolchain.eclass in sync with Gentoo to be able to build Rust 1.73+. Otherwise build will fail due to a missing file from the upstream repo rust-1.72.0-mips-unknown-linux-gnu.tar.xz. Gentoo ref: f66c64d25bc04fc2ef3bd3cba6a8fbc48f42be9f --- .../eclass/rust-toolchain.eclass | 105 +++++++++++------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass index 8c783eaf06..5824a48734 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rust-toolchain.eclass # @MAINTAINER: # Rust Project -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: helps map gentoo arches to rust ABIs # @DESCRIPTION: # This eclass contains a src_unpack default phase function, and @@ -12,20 +12,18 @@ # gentoo arches. case ${EAPI} in - 6) : ;; - 7) : ;; - 8) : ;; - *) die "EAPI=${EAPI:-0} is not supported" ;; + 8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac inherit multilib-build -# @ECLASS-VARIABLE: RUST_TOOLCHAIN_BASEURL +# @ECLASS_VARIABLE: RUST_TOOLCHAIN_BASEURL # @DESCRIPTION: # This variable specifies the base URL used by the # rust_arch_uri and rust_all_arch_uris functions when # generating the URI output list. -: ${RUST_TOOLCHAIN_BASEURL:=https://static.rust-lang.org/dist/} +: "${RUST_TOOLCHAIN_BASEURL:=https://static.rust-lang.org/dist/}" # @FUNCTION: rust_abi # @USAGE: [CHOST-value] @@ -38,21 +36,23 @@ rust_abi() { case ${CTARGET%%*-} in aarch64*gnu) echo aarch64-unknown-linux-gnu;; aarch64*musl) echo aarch64-unknown-linux-musl;; - mips64*) echo mips64-unknown-linux-gnuabi64;; + 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;; - x86_64*gnu) echo x86_64-unknown-linux-gnu;; + powerpc*) echo powerpc-unknown-linux-gnu;; + riscv64*) echo riscv64gc-unknown-linux-gnu;; + s390x*) echo s390x-unknown-linux-gnu;; + x86_64*gnu) echo x86_64-unknown-linux-gnu;; x86_64*musl) echo x86_64-unknown-linux-musl;; - armv6j*s*) echo arm-unknown-linux-gnueabi;; - armv6j*h*) echo arm-unknown-linux-gnueabihf;; - armv7a*h*) echo armv7-unknown-linux-gnueabihf;; - i?86*) echo i686-unknown-linux-gnu;; - mipsel*) echo mipsel-unknown-linux-gnu;; - mips*) echo mips-unknown-linux-gnu;; - powerpc*) echo powerpc-unknown-linux-gnu;; - s390x*) echo s390x-unknown-linux-gnu;; - riscv64*) echo riscv64gc-unknown-linux-gnu;; - *) echo ${CTARGET};; + *) echo ${CTARGET};; esac } @@ -107,22 +107,51 @@ rust_arch_uri() { # rust_all_arch_uris() { - local uris="" - uris+="abi_x86_64? ( elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) - elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) ) " - uris+="arm? ( $(rust_arch_uri arm-unknown-linux-gnueabi "$@") - $(rust_arch_uri arm-unknown-linux-gnueabihf "$@") - $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") ) " - uris+="arm64? ( elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) - elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") ) ) " - uris+="mips? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") - $(rust_arch_uri mipsel-unknown-linux-gnu "$@") - $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) " - uris+="ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) " - uris+="ppc64? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") - $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) " - uris+="s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) " - uris+="abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) " - uris+="riscv? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) " - echo "${uris}" + echo " + abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) + abi_x86_64? ( + elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) + elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) + ) + arm? ( + $(rust_arch_uri arm-unknown-linux-gnueabi "$@") + $(rust_arch_uri arm-unknown-linux-gnueabihf "$@") + $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") + ) + arm64? ( + elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) + elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") ) + ) + ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) + ppc64? ( + big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) + !big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) + ) + riscv? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) + s390? ( $(rust_arch_uri s390x-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? ( $(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 }