diff options
| author | Sam James <sam@gentoo.org> | 2025-10-21 00:07:42 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-10-21 00:11:59 +0100 |
| commit | 6c791dc82c1950195e005d03fbd9f05ca26d25b6 (patch) | |
| tree | e746b56079233cb57baba6aa843d98920a80850d /dev-lang/rust-bin/rust-bin-9999.ebuild | |
| parent | 25baf2a66c5e0b0b08094573aa74031a103bea08 (diff) | |
| download | gentoo-6c791dc82c1950195e005d03fbd9f05ca26d25b6.tar.gz gentoo-6c791dc82c1950195e005d03fbd9f05ca26d25b6.tar.bz2 gentoo-6c791dc82c1950195e005d03fbd9f05ca26d25b6.zip | |
dev-lang/rust-bin: fix multilib src_install failure
This is related to bug #964423 thugh it won't fix that one.
Closes: https://bugs.gentoo.org/964423
Co-authored-by: Matt Jolly <kangie@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/rust-bin/rust-bin-9999.ebuild')
| -rw-r--r-- | dev-lang/rust-bin/rust-bin-9999.ebuild | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild index fed93d0b117a..686b6ed1bad8 100644 --- a/dev-lang/rust-bin/rust-bin-9999.ebuild +++ b/dev-lang/rust-bin/rust-bin-9999.ebuild @@ -21,8 +21,8 @@ elif [[ ${PV} == *beta* ]]; then " else # curl -Ls static.rust-lang.org/dist/channel-rust-${PV}.toml | grep "xz_url.*rust-src" - SRC_URI="$(rust_all_arch_uris "${PV}") - rust-src? ( ${RUST_TOOLCHAIN_BASEURL%/}/2025-01-30/rust-src-${PV}.tar.xz ) + SRC_URI="$(rust_all_arch_uris "rust-${PV}") + rust-src? ( ${RUST_TOOLCHAIN_BASEURL%/}/2025-09-18/rust-src-${PV}.tar.xz ) " KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi @@ -283,10 +283,21 @@ multilib_src_install() { if multilib_is_native_abi; then rust_native_abi_install else - local rust_target + local rust_target version + case ${PV} in + *9999*) + version=nightly + ;; + *beta*) + version=beta + ;; + *) + version=${PV} + ;; + esac rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))" dodir "/opt/${P}/lib/rustlib" - cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\ + cp -vr "${WORKDIR}/rust-${version}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\ "${ED}/opt/${P}/lib/rustlib" || die fi |