summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Pukhlikov <cynede@gentoo.org>2018-05-25 15:39:44 +0400
committerMikhail Pukhlikov <cynede@gentoo.org>2018-05-25 15:39:57 +0400
commit92095dbb4b8e52e573348add6e57bd11de3aafc7 (patch)
treedf930325d0f87916ac2f0affcacacd6b259b45b9
parentsys-auth/rtkit: remove old (diff)
downloadgentoo-92095dbb4b8e52e573348add6e57bd11de3aafc7.tar.gz
gentoo-92095dbb4b8e52e573348add6e57bd11de3aafc7.tar.bz2
gentoo-92095dbb4b8e52e573348add6e57bd11de3aafc7.zip
dev-lang/rust: correct multilib libraries paths
Package-Manager: Portage-2.3.39, Repoman-2.3.9
-rw-r--r--dev-lang/rust/rust-1.26.0-r2.ebuild (renamed from dev-lang/rust/rust-1.26.0-r1.ebuild)6
1 files changed, 4 insertions, 2 deletions
diff --git a/dev-lang/rust/rust-1.26.0-r1.ebuild b/dev-lang/rust/rust-1.26.0-r2.ebuild
index fe5052b39aaa..4a0bbfdb7ec6 100644
--- a/dev-lang/rust/rust-1.26.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.26.0-r2.ebuild
@@ -117,7 +117,7 @@ src_configure() {
extended = $(toml_usex extended)
[install]
prefix = "${EPREFIX}/usr"
- libdir = "$(get_libdir)/${P}"
+ libdir = "$(get_libdir)"
docdir = "share/doc/${P}"
mandir = "share/${P}/man"
[rust]
@@ -172,12 +172,14 @@ src_install() {
abi_libdir=$(get_abi_LIBDIR ${v##*.})
rust_target=$(get_abi_CHOST ${v##*.})
mkdir -p ${D}/usr/${abi_libdir}
- cp ${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib/*.so \
+ cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
${D}/usr/${abi_libdir} || die
done
dodoc COPYRIGHT
+ # FIXME:
+ # Really not sure if that env is needed, specailly LDPATH
cat <<-EOF > "${T}"/50${P}
LDPATH="/usr/$(get_libdir)/${P}"
MANPATH="/usr/share/${P}/man"