From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 62E84139083 for ; Thu, 14 Dec 2017 18:06:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74BB2E0FB7; Thu, 14 Dec 2017 18:06:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DF7DE0FB7 for ; Thu, 14 Dec 2017 18:06:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0FBD33BEC7 for ; Thu, 14 Dec 2017 18:06:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23028AE75 for ; Thu, 14 Dec 2017 18:06:29 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1513274714.f1759e62b93f8aaccfe6ba0835e624a5df656d3a.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: dev-lang/rust/ X-VCS-Repository: proj/musl X-VCS-Files: dev-lang/rust/rust-1.21.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: f1759e62b93f8aaccfe6ba0835e624a5df656d3a X-VCS-Branch: master Date: Thu, 14 Dec 2017 18:06:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bc4d4a48-a55b-43da-829b-72951cef7cb7 X-Archives-Hash: b79171f79f64128440aea9a157822779 commit: f1759e62b93f8aaccfe6ba0835e624a5df656d3a Author: Aric Belsito gmail com> AuthorDate: Thu Dec 14 18:05:14 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Thu Dec 14 18:05:14 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f1759e62 dev-lang/rust: fix paths cargo refuses to bootstrap if we use a different library path, unfortunately. dev-lang/rust/rust-1.21.0.ebuild | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild index 7b04561..e0a13e5 100644 --- a/dev-lang/rust/rust-1.21.0.ebuild +++ b/dev-lang/rust/rust-1.21.0.ebuild @@ -149,7 +149,7 @@ src_configure() { verbose = 2 [install] prefix = "${EPREFIX}/usr" - libdir = "$(get_libdir)/${P}" + libdir = "$(get_libdir)" mandir = "share/${P}/man" docdir = "share/doc/${P}" [rust] @@ -179,12 +179,12 @@ src_compile() { src_install() { env DESTDIR="${D}" ./x.py install || die - rm "${D}/usr/$(get_libdir)/${P}/rustlib/components" || die - rm "${D}/usr/$(get_libdir)/${P}/rustlib/install.log" || die - rm "${D}/usr/$(get_libdir)/${P}/rustlib/manifest-rust-std-${RUSTHOST}" || die - rm "${D}/usr/$(get_libdir)/${P}/rustlib/manifest-rustc" || die - rm "${D}/usr/$(get_libdir)/${P}/rustlib/rust-installer-version" || die - rm "${D}/usr/$(get_libdir)/${P}/rustlib/uninstall.sh" || die + rm "${D}/usr/$(get_libdir)/rustlib/components" || die + rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die + rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-std-${RUSTHOST}" || die + rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustc" || die + rm "${D}/usr/$(get_libdir)/rustlib/rust-installer-version" || die + rm "${D}/usr/$(get_libdir)/rustlib/uninstall.sh" || die mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die @@ -192,17 +192,15 @@ src_install() { mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die if use doc; then - rm "${D}/usr/$(get_libdir)/${P}/rustlib/manifest-rust-docs" || die + rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-docs" || die fi rm "${D}/usr/share/doc/${P}/LICENSE-MIT" || die rm "${D}/usr/share/doc/${P}/LICENSE-APACHE" || die docompress "/usr/share/${P}/man" - dodoc COPYRIGHT cat <<-EOF > "${T}"/50${P} - LDPATH="/usr/$(get_libdir)/${P}" MANPATH="/usr/share/${P}/man" EOF doenvd "${T}"/50${P}