From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Thu, 6 Jun 2019 05:53:37 +0000 (-0700)
Subject: dev-lang/rust: handle libdir workaround on arm as well
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e96cc4c5501c00acacf5f66e40d08c73af02d552;p=gentoo.git

dev-lang/rust: handle libdir workaround on arm as well

Bug: https://bugs.gentoo.org/672816
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild
index c0d1a001cbc3..8973490b5aa2 100644
--- a/dev-lang/rust/rust-1.34.2.ebuild
+++ b/dev-lang/rust/rust-1.34.2.ebuild
@@ -267,12 +267,14 @@ src_install() {
 	done
 
 	# temp fix for https://bugs.gentoo.org/672816
-	if use x86; then
+	# 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