[gentoo-commits] repo/gentoo:master commit in: eclass/

[Arthur Zamarin]

commit:     2b197ab19755a400e431a3f0976f8093bac5c1b6
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 03:05:36 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 11:13:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b197ab1

rust-toolchain.eclass: add rename param to `rust_all_arch_uris()`

Also update `rust_arch_uri` to also fetch the asc if we're renaming
so that we can use verify-sig.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 eclass/rust-toolchain.eclass | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 2d9c56b4d6b6..41fccb7c4a07 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -73,6 +73,7 @@ rust_abi() {
 rust_arch_uri() {
        if [ -n "$3" ]; then
                echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> 
${3}-${1}.tar.xz"
+               echo "verify-sig? ( 
${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz.asc -> ${3}-${1}.tar.xz.asc )"
        else
                echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz"
                echo "verify-sig? ( 
${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz.asc )"
@@ -80,7 +81,7 @@ rust_arch_uri() {
 }
 
 # @FUNCTION: rust_all_arch_uris
-# @USAGE: <base-uri> [alt-distfile-basename]
+# @USAGE: [alt-distfile-basename] [rust_arch_uri-rename-param]
 # @DESCRIPTION:
 # Outputs the URIs for SRC_URI to help fetch dependencies, using a base URI
 # provided as an argument. Optionally allows for distfile renaming via a 
specified
@@ -91,28 +92,31 @@ rust_arch_uri() {
 #
 rust_all_arch_uris()
 {
+       local alt_basename="$1"
+       local rename_param="$2"
+
        echo "
-       abi_x86_32? ( elibc_glibc? ( $(rust_arch_uri i686-unknown-linux-gnu 
"$@") ) )
+       abi_x86_32? ( elibc_glibc? ( $(rust_arch_uri i686-unknown-linux-gnu 
"${alt_basename}" "${rename_param}") ) )
        abi_x86_64? (
-               elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu  "$@") )
-               elibc_musl?  ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") )
+               elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu  
"${alt_basename}" "${rename_param}") )
+               elibc_musl?  ( $(rust_arch_uri x86_64-unknown-linux-musl 
"${alt_basename}" "${rename_param}") )
        )
        arm? ( elibc_glibc? (
-               $(rust_arch_uri arm-unknown-linux-gnueabi     "$@")
-               $(rust_arch_uri arm-unknown-linux-gnueabihf   "$@")
-               $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@")
+               $(rust_arch_uri arm-unknown-linux-gnueabi     "${alt_basename}" 
"${rename_param}")
+               $(rust_arch_uri arm-unknown-linux-gnueabihf   "${alt_basename}" 
"${rename_param}")
+               $(rust_arch_uri armv7-unknown-linux-gnueabihf "${alt_basename}" 
"${rename_param}")
        ) )
        arm64? (
-               elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu  "$@") 
)
-               elibc_musl?  ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") 
)
+               elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu  
"${alt_basename}" "${rename_param}") )
+               elibc_musl?  ( $(rust_arch_uri aarch64-unknown-linux-musl 
"${alt_basename}" "${rename_param}") )
        )
-       ppc? ( elibc_glibc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) 
)
+       ppc? ( elibc_glibc? ( $(rust_arch_uri powerpc-unknown-linux-gnu 
"${alt_basename}" "${rename_param}") ) )
        ppc64? (
-               big-endian?  ( elibc_glibc? ( $(rust_arch_uri 
powerpc64-unknown-linux-gnu   "$@") ) )
-               !big-endian? ( elibc_glibc? ( $(rust_arch_uri 
powerpc64le-unknown-linux-gnu "$@") ) )
+               big-endian?  ( elibc_glibc? ( $(rust_arch_uri 
powerpc64-unknown-linux-gnu   "${alt_basename}" "${rename_param}") ) )
+               !big-endian? ( elibc_glibc? ( $(rust_arch_uri 
powerpc64le-unknown-linux-gnu "${alt_basename}" "${rename_param}") ) )
        )
-       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 
"$@") ) )
+       riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu 
"${alt_basename}" "${rename_param}") ) )
+       s390?  ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu     
"${alt_basename}" "${rename_param}") ) )
+       loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu 
"${alt_basename}" "${rename_param}") ) )
        "
 }