Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/
Date: Fri, 05 Feb 2021 19:31:38
Message-Id: 1612553415.5c10219a508f89e245ad8f25d1e04e262a34cd8c.gyakovlev@gentoo
1 commit: 5c10219a508f89e245ad8f25d1e04e262a34cd8c
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 3 22:06:35 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 5 19:30:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c10219a
7
8 dev-lang/rust: add rustc -vV patch to 1.49.0
9
10 No revbump, since moz ebuilds have workaround now and we can't patch
11 rust-bin.
12
13 Bug: https://bugs.gentoo.org/768543
14 Package-Manager: Portage-3.0.14, Repoman-3.0.2
15 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
16
17 dev-lang/rust/files/1.49.0-llvm-ver-display.patch | 31 +++++++++++++++++++++++
18 dev-lang/rust/rust-1.49.0.ebuild | 1 +
19 2 files changed, 32 insertions(+)
20
21 diff --git a/dev-lang/rust/files/1.49.0-llvm-ver-display.patch b/dev-lang/rust/files/1.49.0-llvm-ver-display.patch
22 new file mode 100644
23 index 00000000000..e2b6396b5eb
24 --- /dev/null
25 +++ b/dev-lang/rust/files/1.49.0-llvm-ver-display.patch
26 @@ -0,0 +1,31 @@
27 +From 64c1b0d614949f405d8b4498a3b2ea59d9ec230e Mon Sep 17 00:00:00 2001
28 +From: bjorn3 <bjorn3@××××××××××××××××××××.com>
29 +Date: Wed, 13 Jan 2021 12:15:42 +0100
30 +Subject: [PATCH] Fix -Cpasses=list and llvm version print with -vV
31 +
32 +---
33 + compiler/rustc_driver/src/lib.rs | 4 ++--
34 + 1 file changed, 2 insertions(+), 2 deletions(-)
35 +
36 +diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
37 +index f434673c39e10..c668c94bb08c4 100644
38 +--- a/compiler/rustc_driver/src/lib.rs
39 ++++ b/compiler/rustc_driver/src/lib.rs
40 +@@ -808,7 +808,7 @@ pub fn version(binary: &str, matches: &getopts::Matches) {
41 + println!("commit-date: {}", unw(util::commit_date_str()));
42 + println!("host: {}", config::host_triple());
43 + println!("release: {}", unw(util::release_str()));
44 +- if cfg!(llvm) {
45 ++ if cfg!(feature = "llvm") {
46 + get_builtin_codegen_backend("llvm")().print_version();
47 + }
48 + }
49 +@@ -1096,7 +1096,7 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
50 + }
51 +
52 + if cg_flags.iter().any(|x| *x == "passes=list") {
53 +- if cfg!(llvm) {
54 ++ if cfg!(feature = "llvm") {
55 + get_builtin_codegen_backend("llvm")().print_passes();
56 + }
57 + return None;
58
59 diff --git a/dev-lang/rust/rust-1.49.0.ebuild b/dev-lang/rust/rust-1.49.0.ebuild
60 index 776c4276d3a..1ff75dfdbed 100644
61 --- a/dev-lang/rust/rust-1.49.0.ebuild
62 +++ b/dev-lang/rust/rust-1.49.0.ebuild
63 @@ -136,6 +136,7 @@ PATCHES=(
64 "${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
65 "${FILESDIR}"/1.47.0-llvm-tensorflow-fix.patch
66 "${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch
67 + "${FILESDIR}"/1.49.0-llvm-ver-display.patch
68 )
69
70 S="${WORKDIR}/${MY_P}-src"