commit: 31931d763c9f50d60e2b771d6c94f6be8c85fad2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Thu Aug 28 15:34:38 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Thu Aug 28 15:35:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31931d76
dev-lang/rust-bin: fix ignore rust-analysis bin on arches blocking rust-analyzer Closes: https://bugs.gentoo.org/961746 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-lang/rust-bin/rust-bin-1.88.0.ebuild | 6 ++++-- dev-lang/rust-bin/rust-bin-1.89.0.ebuild | 6 ++++-- dev-lang/rust-bin/rust-bin-9999.ebuild | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.88.0.ebuild b/dev-lang/rust-bin/rust-bin-1.88.0.ebuild index 047f7b9fcd66..10e3620bcfd8 100644 --- a/dev-lang/rust-bin/rust-bin-1.88.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.88.0.ebuild @@ -169,13 +169,15 @@ patchelf_for_bin() { rust_native_abi_install() { pushd "${S}" >/dev/null || die - local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" local std="$(grep 'std' ./components || die "std not found in components")" local components=( "rustc" "cargo" "${std}" ) use doc && components+=( "rust-docs" ) use clippy && components+=( "clippy-preview" ) use rustfmt && components+=( "rustfmt-preview" ) - use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" ) + if use rust-analyzer; then + local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" + components+=( "rust-analyzer-preview" "${analysis}" ) + fi # Rust component 'rust-src' is extracted from separate archive if use rust-src; then einfo "Combining rust and rust-src installers" diff --git a/dev-lang/rust-bin/rust-bin-1.89.0.ebuild b/dev-lang/rust-bin/rust-bin-1.89.0.ebuild index cd80f2761b1b..1a557be53866 100644 --- a/dev-lang/rust-bin/rust-bin-1.89.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.89.0.ebuild @@ -169,13 +169,15 @@ patchelf_for_bin() { rust_native_abi_install() { pushd "${S}" >/dev/null || die - local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" local std="$(grep 'std' ./components || die "std not found in components")" local components=( "rustc" "cargo" "${std}" ) use doc && components+=( "rust-docs" ) use clippy && components+=( "clippy-preview" ) use rustfmt && components+=( "rustfmt-preview" ) - use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" ) + if use rust-analyzer; then + local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" + components+=( "rust-analyzer-preview" "${analysis}" ) + fi # Rust component 'rust-src' is extracted from separate archive if use rust-src; then einfo "Combining rust and rust-src installers" diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild index ef8fe8615c5c..3a22a3109ef4 100644 --- a/dev-lang/rust-bin/rust-bin-9999.ebuild +++ b/dev-lang/rust-bin/rust-bin-9999.ebuild @@ -165,13 +165,15 @@ patchelf_for_bin() { rust_native_abi_install() { pushd "${S}" >/dev/null || die - local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" local std="$(grep 'std' ./components || die "std not found in components")" local components=( "rustc" "cargo" "${std}" ) use doc && components+=( "rust-docs" ) use clippy && components+=( "clippy-preview" ) use rustfmt && components+=( "rustfmt-preview" ) - use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" ) + if use rust-analyzer; then + local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" + components+=( "rust-analyzer-preview" "${analysis}" ) + fi # Rust component 'rust-src' is extracted from separate archive if use rust-src; then einfo "Combining rust and rust-src installers"
