[gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/

[Georgy Yakovlev]

commit:     e30faae568c3d159f00d756840c716bd044bb8ce
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 05:56:07 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 05:56:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30faae5

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 <gyakovlev <AT> gentoo.org>

 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 fb6e6ecf273..64f0e0d6344 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