From e30faae568c3d159f00d756840c716bd044bb8ce Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Wed, 5 Jun 2019 22:56:07 -0700 Subject: [PATCH] dev-lang/rust: add arm libdir fix to 1.35.0 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Georgy Yakovlev --- dev-lang/rust/rust-1.35.0.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild index fb6e6ecf2739..64f0e0d63448 100644 --- a/dev-lang/rust/rust-1.35.0.ebuild +++ b/dev-lang/rust/rust-1.35.0.ebuild @@ -274,13 +274,15 @@ src_install() { "${ED}/usr/${abi_libdir}" || die done - # temp fix for https://bugs.gentoo.org/672816 - if use x86; then + # temp fix for https://bugs.gentoo.org/672816 + # FIXME: this should handle libdir=lib, not exact arches + if { use x86 || use arm; }; then local rust_target wrongdir rightdir rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends" rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends" if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then + einfo "fixing bug #672816" mv "${wrongdir}" "${rightdir}" || die rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die fi -- 2.26.2