Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/
Date: Mon, 27 May 2019 00:13:17
Message-Id: 1558915979.564f0da7e6758a828264dfb061cf4980335e42e9.gyakovlev@gentoo
1 commit: 564f0da7e6758a828264dfb061cf4980335e42e9
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 27 00:12:30 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Mon May 27 00:12:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564f0da7
7
8 dev-lang/rust: fix codegen-backends location on x86 for 1.35.0
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 dev-lang/rust/rust-1.35.0.ebuild | 12 ++++++++++++
14 1 file changed, 12 insertions(+)
15
16 diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild
17 index 42008af25b5..29bf1ddae80 100644
18 --- a/dev-lang/rust/rust-1.35.0.ebuild
19 +++ b/dev-lang/rust/rust-1.35.0.ebuild
20 @@ -274,6 +274,18 @@ src_install() {
21 "${ED}/usr/${abi_libdir}" || die
22 done
23
24 + # temp fix for https://bugs.gentoo.org/672816
25 + if use x86; then
26 + local rust_target wrongdir rightdir
27 + rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
28 + wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
29 + rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
30 + if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
31 + mv "${wrongdir}" "${rightdir}" || die
32 + rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
33 + fi
34 + fi # end temp fix
35 +
36 dodoc COPYRIGHT
37
38 # FIXME: