[gentoo-commits] proj/musl:master commit in: dev-lang/rust/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: dev-lang/rust/
Date: Thu, 14 Dec 2017 18:06:29 +0000 (UTC)	[thread overview]
Message-ID: <1513274714.f1759e62b93f8aaccfe6ba0835e624a5df656d3a.lluixhi@gentoo> (raw)

commit:     f1759e62b93f8aaccfe6ba0835e624a5df656d3a
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 18:05:14 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> 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}

next             reply	other threads:[~2017-12-14 18:06 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-14 18:06 Aric Belsito [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-14 19:40 [gentoo-commits] proj/musl:master commit in: dev-lang/rust/ Sam James
2024-01-13 16:40 Sam James
2024-01-13 16:37 Sam James
2024-01-13 16:37 Sam James
2022-06-10 20:48 Jory Pratt
2022-04-20 16:58 Jory Pratt
2022-01-21  4:29 Jory Pratt
2022-01-21  4:28 Jory Pratt
2022-01-18  1:10 Jory Pratt
2021-04-30 15:10 Jory Pratt
2021-04-29 20:13 Dave Hughes
2019-11-06 22:58 Jory Pratt
2018-08-18  9:51 Anthony G. Basile
2018-06-28  3:01 Aric Belsito
2018-06-27 17:26 Aric Belsito
2018-06-19 22:03 Aric Belsito
2018-06-19  0:47 Aric Belsito
2018-06-18 21:57 Aric Belsito
2018-06-16 18:42 Aric Belsito
2018-06-16 17:16 Aric Belsito
2018-05-11 19:50 Aric Belsito
2018-04-27 10:34 Anthony G. Basile
2018-04-15 19:01 Anthony G. Basile
2018-02-06  1:11 Aric Belsito
2018-02-06  1:11 Aric Belsito
2018-02-06  1:11 Aric Belsito
2018-02-06  1:11 Aric Belsito
2018-01-31 19:14 Aric Belsito
2018-01-31 18:58 Aric Belsito
2018-01-31 18:40 Aric Belsito
2018-01-29 19:46 Aric Belsito
2018-01-03 18:39 Aric Belsito
2017-12-15  3:18 Aric Belsito
2017-12-14  5:17 Aric Belsito
2017-12-14  5:10 Aric Belsito

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7b04561 dfblob:e0a13e5 )
 OR (
bs:"[gentoo-commits] proj/musl:master commit in: dev-lang/rust/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1513274714.f1759e62b93f8aaccfe6ba0835e624a5df656d3a.lluixhi@gentoo \
    --to=lluixhi@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox