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 4A4901382C5 for ; Fri, 5 Feb 2021 19:31:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7701FE0880; Fri, 5 Feb 2021 19:31:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5CE0BE0880 for ; Fri, 5 Feb 2021 19:31:37 +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 C139B342EBB for ; Fri, 5 Feb 2021 19:31:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E8344A4 for ; Fri, 5 Feb 2021 19:31:34 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1612553415.5c10219a508f89e245ad8f25d1e04e262a34cd8c.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/files/1.49.0-llvm-ver-display.patch dev-lang/rust/rust-1.49.0.ebuild X-VCS-Directories: dev-lang/rust/ dev-lang/rust/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 5c10219a508f89e245ad8f25d1e04e262a34cd8c X-VCS-Branch: master Date: Fri, 5 Feb 2021 19:31:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d93673b-b3f4-4c7e-9f04-85e5aff42a5c X-Archives-Hash: 18f9ecbe127a9e79a191e660819eb5bd commit: 5c10219a508f89e245ad8f25d1e04e262a34cd8c Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Feb 3 22:06:35 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Feb 5 19:30:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c10219a dev-lang/rust: add rustc -vV patch to 1.49.0 No revbump, since moz ebuilds have workaround now and we can't patch rust-bin. Bug: https://bugs.gentoo.org/768543 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/files/1.49.0-llvm-ver-display.patch | 31 +++++++++++++++++++++++ dev-lang/rust/rust-1.49.0.ebuild | 1 + 2 files changed, 32 insertions(+) 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 new file mode 100644 index 00000000000..e2b6396b5eb --- /dev/null +++ b/dev-lang/rust/files/1.49.0-llvm-ver-display.patch @@ -0,0 +1,31 @@ +From 64c1b0d614949f405d8b4498a3b2ea59d9ec230e Mon Sep 17 00:00:00 2001 +From: bjorn3 +Date: Wed, 13 Jan 2021 12:15:42 +0100 +Subject: [PATCH] Fix -Cpasses=list and llvm version print with -vV + +--- + compiler/rustc_driver/src/lib.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs +index f434673c39e10..c668c94bb08c4 100644 +--- a/compiler/rustc_driver/src/lib.rs ++++ b/compiler/rustc_driver/src/lib.rs +@@ -808,7 +808,7 @@ pub fn version(binary: &str, matches: &getopts::Matches) { + println!("commit-date: {}", unw(util::commit_date_str())); + println!("host: {}", config::host_triple()); + println!("release: {}", unw(util::release_str())); +- if cfg!(llvm) { ++ if cfg!(feature = "llvm") { + get_builtin_codegen_backend("llvm")().print_version(); + } + } +@@ -1096,7 +1096,7 @@ pub fn handle_options(args: &[String]) -> Option { + } + + if cg_flags.iter().any(|x| *x == "passes=list") { +- if cfg!(llvm) { ++ if cfg!(feature = "llvm") { + get_builtin_codegen_backend("llvm")().print_passes(); + } + return None; diff --git a/dev-lang/rust/rust-1.49.0.ebuild b/dev-lang/rust/rust-1.49.0.ebuild index 776c4276d3a..1ff75dfdbed 100644 --- a/dev-lang/rust/rust-1.49.0.ebuild +++ b/dev-lang/rust/rust-1.49.0.ebuild @@ -136,6 +136,7 @@ PATCHES=( "${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.47.0-llvm-tensorflow-fix.patch "${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch + "${FILESDIR}"/1.49.0-llvm-ver-display.patch ) S="${WORKDIR}/${MY_P}-src"