| 1 |
commit: e30faae568c3d159f00d756840c716bd044bb8ce |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 6 05:56:07 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 6 05:56:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30faae5 |
| 7 |
|
| 8 |
dev-lang/rust: add arm libdir fix to 1.35.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.14 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/rust/rust-1.35.0.ebuild | 6 ++++-- |
| 14 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild |
| 17 |
index fb6e6ecf273..64f0e0d6344 100644 |
| 18 |
--- a/dev-lang/rust/rust-1.35.0.ebuild |
| 19 |
+++ b/dev-lang/rust/rust-1.35.0.ebuild |
| 20 |
@@ -274,13 +274,15 @@ 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 |
+ # temp fix for https://bugs.gentoo.org/672816 |
| 27 |
+ # FIXME: this should handle libdir=lib, not exact arches |
| 28 |
+ if { use x86 || use arm; }; then |
| 29 |
local rust_target wrongdir rightdir |
| 30 |
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) |
| 31 |
wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends" |
| 32 |
rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends" |
| 33 |
if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then |
| 34 |
+ einfo "fixing bug #672816" |
| 35 |
mv "${wrongdir}" "${rightdir}" || die |
| 36 |
rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die |
| 37 |
fi |
Archives