commit: e96cc4c5501c00acacf5f66e40d08c73af02d552 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Thu Jun 6 05:53:37 2019 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Jun 6 05:56:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96cc4c5
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 <AT> gentoo.org> dev-lang/rust/rust-1.34.2.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild index c0d1a001cbc..8973490b5aa 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
