commit:     564f0da7e6758a828264dfb061cf4980335e42e9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 00:12:30 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 27 00:12:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564f0da7

dev-lang/rust: fix codegen-backends location on x86 for 1.35.0

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-lang/rust/rust-1.35.0.ebuild | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild
index 42008af25b5..29bf1ddae80 100644
--- a/dev-lang/rust/rust-1.35.0.ebuild
+++ b/dev-lang/rust/rust-1.35.0.ebuild
@@ -274,6 +274,18 @@ src_install() {
                   "${ED}/usr/${abi_libdir}" || die
        done
 
+               # temp fix for https://bugs.gentoo.org/672816
+       if use x86; 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
+                       mv "${wrongdir}" "${rightdir}" || die
+                       rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
+               fi
+       fi # end temp fix
+
        dodoc COPYRIGHT
 
        # FIXME:

Reply via email to