commit:     cb267efc08762205ed876dcb7f6339f4ad7f6883
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 21:36:24 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 21:36:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb267efc

Revert "dev-lang/rust-bin: re-enable strip in 1.70.0"

This reverts commit ad740d09d0a952503a4ecee24d1096207d2e0785.

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../{rust-bin-1.70.0-r1.ebuild => rust-bin-1.70.0.ebuild}        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-1.70.0-r1.ebuild 
b/dev-lang/rust-bin/rust-bin-1.70.0.ebuild
similarity index 97%
rename from dev-lang/rust-bin/rust-bin-1.70.0-r1.ebuild
rename to dev-lang/rust-bin/rust-bin-1.70.0.ebuild
index 5205a10f872a..93ef429779a2 100644
--- a/dev-lang/rust-bin/rust-bin-1.70.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.70.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
 
 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"
+
 QA_PREBUILT="
        opt/${P}/bin/.*
        opt/${P}/lib/.*.so
@@ -204,11 +208,6 @@ multilib_src_install() {
 
        # BUG: installs x86_64 binary on other arches
        rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
-
-       # libLLVM must NOT be stripped
-       # it's not present on all arches, but if present and stripped rustc 
will segfault.
-       # https://github.com/rust-lang/rust/issues/112286
-       dostrip -x *libLLVM-*
 }
 
 pkg_postinst() {

Reply via email to