From: Matt Jolly <kan...@gentoo.org> We're the ones deviating from the norm. Including the profiler does not noticably increase the build time (at least on amd64), nor does it pull in additional dependencies.
What it _does_ do is break upstream build systems that assume a standard rust configuration like upstream would ship (i.e. with profiler). This is particularly challenging as -bin (obviously) does not have this problem. Closes: https://bugs.gentoo.org/941146 Signed-off-by: Matt Jolly <kan...@gentoo.org> --- dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild | 5 ++++- dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild | 5 ++++- dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild | 5 ++++- dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild | 16 ++++++++-------- dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild | 16 ++++++++-------- dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild | 17 ++++++++--------- dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild | 4 +++- dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild | 3 ++- dev-lang/rust/rust-1.71.1-r100.ebuild | 13 +++++-------- dev-lang/rust/rust-1.74.1-r100.ebuild | 13 +++++-------- dev-lang/rust/rust-1.75.0-r100.ebuild | 13 +++++-------- dev-lang/rust/rust-1.77.1-r100.ebuild | 13 +++++-------- dev-lang/rust/rust-1.79.0-r100.ebuild | 13 +++++-------- dev-lang/rust/rust-1.80.1-r100.ebuild | 11 ++++------- dev-lang/rust/rust-1.81.0-r100.ebuild | 4 ++-- dev-lang/rust/rust-1.82.0-r100.ebuild | 4 ++-- 16 files changed, 74 insertions(+), 81 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild index 75c3e4c3db47..f6253e143ceb 100644 --- a/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild @@ -25,7 +25,8 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + +DEPEND="" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -39,6 +40,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" diff --git a/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild index e3953894d833..72d99299f2f5 100644 --- a/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild @@ -35,7 +35,8 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + +DEPEND="" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -49,6 +50,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" diff --git a/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild index 4b621acc54cf..2215bfe6392a 100644 --- a/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild @@ -35,7 +35,8 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + +DEPEND="" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -49,6 +50,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" diff --git a/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild index 655805403a51..3eb7823bd8f0 100644 --- a/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild @@ -34,8 +34,9 @@ SRC_URI+=" mips? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt" -REQUIRED_USE="${LLVM_REQUIRED_USE} x86? ( cpu_flags_x86_sse2 )" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" + +DEPEND="" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -49,6 +50,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" @@ -108,10 +111,9 @@ multilib_src_install() { local analysis std analysis="$(grep 'analysis' ./components)" std="$(grep 'std' ./components)" - local components="rustc,cargo,${std}" + local components="rustc,cargo,rust-demangler-preview,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use profiler && components="${components},rust-demangler-preview" use rustfmt && components="${components},rustfmt-preview" use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}" # Rust component 'rust-src' is extracted from separate archive @@ -143,13 +145,13 @@ multilib_src_install() { cargo rustc rustdoc + rust-demangler rust-gdb rust-gdbgui rust-lldb ) use clippy && symlinks+=( clippy-driver cargo-clippy ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -184,6 +186,7 @@ multilib_src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -197,9 +200,6 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild index 2272ee550817..dbfb6c74582c 100644 --- a/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild @@ -37,8 +37,9 @@ SRC_URI+=" riscv? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt" -REQUIRED_USE="${LLVM_REQUIRED_USE} x86? ( cpu_flags_x86_sse2 )" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" + +DEPEND="" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -52,6 +53,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" @@ -111,10 +114,9 @@ multilib_src_install() { local analysis std analysis="$(grep 'analysis' ./components)" std="$(grep 'std' ./components)" - local components="rustc,cargo,${std}" + local components="rustc,cargo,rust-demangler-preview,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use profiler && components="${components},rust-demangler-preview" use rustfmt && components="${components},rustfmt-preview" use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}" # Rust component 'rust-src' is extracted from separate archive @@ -146,13 +148,13 @@ multilib_src_install() { cargo rustc rustdoc + rust-demangler rust-gdb rust-gdbgui rust-lldb ) use clippy && symlinks+=( clippy-driver cargo-clippy ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -187,6 +189,7 @@ multilib_src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -200,9 +203,6 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild index 979c50e93333..692e2ca9ed7a 100644 --- a/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild @@ -6,7 +6,6 @@ EAPI=8 LLVM_COMPAT=( 18 ) LLVM_OPTIONAL="yes" - inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" @@ -42,8 +41,9 @@ SRC_URI+=" ppc64? ( elibc_musl? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" + +DEPEND="" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -57,6 +57,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" @@ -116,10 +118,9 @@ multilib_src_install() { local analysis std analysis="$(grep 'analysis' ./components)" std="$(grep 'std' ./components)" - local components="rustc,cargo,${std}" + local components="rustc,cargo,rust-demangler-preview,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use profiler && components="${components},rust-demangler-preview" use rustfmt && components="${components},rustfmt-preview" use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}" # Rust component 'rust-src' is extracted from separate archive @@ -151,13 +152,13 @@ multilib_src_install() { cargo rustc rustdoc + rust-demangler rust-gdb rust-gdbgui rust-lldb ) use clippy && symlinks+=( clippy-driver cargo-clippy ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -192,6 +193,7 @@ multilib_src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -205,9 +207,6 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild index e567591ee075..d4f56dbf9f82 100644 --- a/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild @@ -1,3 +1,4 @@ + # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 @@ -42,7 +43,6 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -56,6 +56,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" diff --git a/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild index 83d473135eac..668cae0873f0 100644 --- a/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild @@ -42,7 +42,6 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" RDEPEND=" >=app-eselect/eselect-rust-20190311 @@ -56,6 +55,8 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-rust ) " +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + # stripping rust may break it (at least on x86_64) # https://github.com/rust-lang/rust/issues/112286 RESTRICT="strip" diff --git a/dev-lang/rust/rust-1.71.1-r100.ebuild b/dev-lang/rust/rust-1.71.1-r100.ebuild index 3b6a3af34882..2c3213e5564a 100644 --- a/dev-lang/rust/rust-1.71.1-r100.ebuild +++ b/dev-lang/rust/rust-1.71.1-r100.ebuild @@ -40,7 +40,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -297,10 +297,9 @@ src_configure() { rust_targets="${rust_targets#,}" # cargo and rustdoc are mandatory and should always be included - local tools='"cargo","rustdoc"' + local tools='"cargo","rustdoc", "rust-demangler"' use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' - use profiler && tools+=',"rust-demangler"' use rustfmt && tools+=',"rustfmt"' use rust-analyzer && tools+=',"rust-analyzer"' use rust-src && tools+=',"src"' @@ -373,7 +372,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -624,11 +623,11 @@ src_install() { rust-gdb rust-gdbgui rust-lldb + rust-demangler ) use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -669,6 +668,7 @@ src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -687,9 +687,6 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild b/dev-lang/rust/rust-1.74.1-r100.ebuild index 3fd68ccd1eff..c0f6ef066d55 100644 --- a/dev-lang/rust/rust-1.74.1-r100.ebuild +++ b/dev-lang/rust/rust-1.74.1-r100.ebuild @@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -322,10 +322,9 @@ src_configure() { rust_targets="${rust_targets#,}" # cargo and rustdoc are mandatory and should always be included - local tools='"cargo","rustdoc"' + local tools='"cargo","rustdoc", "rust-demangler"' use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' - use profiler && tools+=',"rust-demangler"' use rustfmt && tools+=',"rustfmt"' use rust-analyzer && tools+=',"rust-analyzer"' use rust-src && tools+=',"src"' @@ -407,7 +406,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -660,11 +659,11 @@ src_install() { rust-gdb rust-gdbgui rust-lldb + rust-demangler ) use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -705,6 +704,7 @@ src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -723,9 +723,6 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust/rust-1.75.0-r100.ebuild b/dev-lang/rust/rust-1.75.0-r100.ebuild index 908f761ae430..52afbb35cbd2 100644 --- a/dev-lang/rust/rust-1.75.0-r100.ebuild +++ b/dev-lang/rust/rust-1.75.0-r100.ebuild @@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -325,10 +325,9 @@ src_configure() { rust_targets="${rust_targets#,}" # cargo and rustdoc are mandatory and should always be included - local tools='"cargo","rustdoc"' + local tools='"cargo","rustdoc", "rust-demangler"' use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' - use profiler && tools+=',"rust-demangler"' use rustfmt && tools+=',"rustfmt"' use rust-analyzer && tools+=',"rust-analyzer"' use rust-src && tools+=',"src"' @@ -410,7 +409,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -663,11 +662,11 @@ src_install() { rust-gdb rust-gdbgui rust-lldb + rust-demangler ) use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -708,6 +707,7 @@ src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -726,9 +726,6 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust/rust-1.77.1-r100.ebuild b/dev-lang/rust/rust-1.77.1-r100.ebuild index 1bfd946035a1..7cc79178dcf4 100644 --- a/dev-lang/rust/rust-1.77.1-r100.ebuild +++ b/dev-lang/rust/rust-1.77.1-r100.ebuild @@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -323,10 +323,9 @@ src_configure() { rust_targets="${rust_targets#,}" # cargo and rustdoc are mandatory and should always be included - local tools='"cargo","rustdoc"' + local tools='"cargo","rustdoc", "rust-demangler"' use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' - use profiler && tools+=',"rust-demangler"' use rustfmt && tools+=',"rustfmt"' use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"' use rust-src && tools+=',"src"' @@ -408,7 +407,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -662,11 +661,11 @@ src_install() { rust-gdb rust-gdbgui rust-lldb + rust-demangler ) use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -707,6 +706,7 @@ src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -725,9 +725,6 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust/rust-1.79.0-r100.ebuild b/dev-lang/rust/rust-1.79.0-r100.ebuild index 8830c77cd302..2fae6d39edb5 100644 --- a/dev-lang/rust/rust-1.79.0-r100.ebuild +++ b/dev-lang/rust/rust-1.79.0-r100.ebuild @@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -323,10 +323,9 @@ src_configure() { rust_targets="${rust_targets#,}" # cargo and rustdoc are mandatory and should always be included - local tools='"cargo","rustdoc"' + local tools='"cargo","rustdoc", "rust-demangler"' use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' - use profiler && tools+=',"rust-demangler"' use rustfmt && tools+=',"rustfmt"' use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"' use rust-src && tools+=',"src"' @@ -407,7 +406,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -664,11 +663,11 @@ src_install() { rust-gdb rust-gdbgui rust-lldb + rust-demangler ) use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -709,6 +708,7 @@ src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -727,9 +727,6 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild b/dev-lang/rust/rust-1.80.1-r100.ebuild index 5351be43614d..7f175723c962 100644 --- a/dev-lang/rust/rust-1.80.1-r100.ebuild +++ b/dev-lang/rust/rust-1.80.1-r100.ebuild @@ -42,7 +42,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -324,7 +324,6 @@ src_configure() { local tools='"cargo","rustdoc"' use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' - use profiler && tools+=',"rust-demangler"' use rustfmt && tools+=',"rustfmt"' use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"' use rust-src && tools+=',"src"' @@ -405,7 +404,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -662,11 +661,11 @@ src_install() { rust-gdb rust-gdbgui rust-lldb + rust-demangler ) use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -707,6 +706,7 @@ src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -725,9 +725,6 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" diff --git a/dev-lang/rust/rust-1.81.0-r100.ebuild b/dev-lang/rust/rust-1.81.0-r100.ebuild index 46f072f13fc1..fdd192d64b9e 100644 --- a/dev-lang/rust/rust-1.81.0-r100.ebuild +++ b/dev-lang/rust/rust-1.81.0-r100.ebuild @@ -42,7 +42,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -407,7 +407,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" diff --git a/dev-lang/rust/rust-1.82.0-r100.ebuild b/dev-lang/rust/rust-1.82.0-r100.ebuild index 01f7959b4756..884ff649b4d5 100644 --- a/dev-lang/rust/rust-1.82.0-r100.ebuild +++ b/dev-lang/rust/rust-1.82.0-r100.ebuild @@ -42,7 +42,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -412,7 +412,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = $(toml_usex profiler) + profiler = true cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" -- 2.47.0
