| 1 |
commit: 3474de23b4bd438ea766e82a4c37f7ebc97c7392 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 27 00:06:35 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 27 00:12:58 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3474de23 |
| 7 |
|
| 8 |
dev-lang/rust: fix codegen-backends location on x86 |
| 9 |
|
| 10 |
comitting to stable without revbump so I don't force |
| 11 |
all other users to rebuild this beast |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/672816 |
| 14 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
| 15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-lang/rust/rust-1.34.2.ebuild | 12 ++++++++++++ |
| 18 |
1 file changed, 12 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild |
| 21 |
index 6a8ae98793b..c0d1a001cbc 100644 |
| 22 |
--- a/dev-lang/rust/rust-1.34.2.ebuild |
| 23 |
+++ b/dev-lang/rust/rust-1.34.2.ebuild |
| 24 |
@@ -266,6 +266,18 @@ src_install() { |
| 25 |
"${ED}/usr/${abi_libdir}" || die |
| 26 |
done |
| 27 |
|
| 28 |
+ # temp fix for https://bugs.gentoo.org/672816 |
| 29 |
+ if use x86; then |
| 30 |
+ local rust_target wrongdir rightdir |
| 31 |
+ rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) |
| 32 |
+ wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends" |
| 33 |
+ rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends" |
| 34 |
+ if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then |
| 35 |
+ mv "${wrongdir}" "${rightdir}" || die |
| 36 |
+ rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die |
| 37 |
+ fi |
| 38 |
+ fi # end temp fix |
| 39 |
+ |
| 40 |
dodoc COPYRIGHT |
| 41 |
|
| 42 |
# FIXME: |
Archives