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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36C80158086 for ; Fri, 12 Nov 2021 20:02:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7508EE099C; Fri, 12 Nov 2021 20:01:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 092F7E099C for ; Fri, 12 Nov 2021 20:01:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6E0D342E32 for ; Fri, 12 Nov 2021 20:01:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46ECE1BD for ; Fri, 12 Nov 2021 20:01:56 +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: <1636747295.d2e9fc2c57ca98303914d5632c20edce74f846a6.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/metadata.xml dev-lang/rust/rust-1.56.1.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: d2e9fc2c57ca98303914d5632c20edce74f846a6 X-VCS-Branch: master Date: Fri, 12 Nov 2021 20:01:56 +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: b9a4600b-d872-4c0b-878b-73b0e693db05 X-Archives-Hash: 3ff87783008e0eaf2ec44a2d06c31215 commit: d2e9fc2c57ca98303914d5632c20edce74f846a6 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Nov 12 19:56:17 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Nov 12 20:01:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e9fc2c dev-lang/rust: add rust-src useflag previously 'src' component was installed by 'rls' useflag. let's split it out for people who want 'src' but don't need rls. Bug: https://bugs.gentoo.org/800785 Bug: https://bugs.gentoo.org/819786 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/metadata.xml | 1 + dev-lang/rust/rust-1.56.1.ebuild | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml index 4ecf03a3d4e..a51257c9ae1 100644 --- a/dev-lang/rust/metadata.xml +++ b/dev-lang/rust/metadata.xml @@ -16,6 +16,7 @@ Build a multi-threaded rustc (experimental, not tested by upstream) Install rls, Rust Language Server (used with IDEs supporting RLS protocol) Install rustfmt, Rust code formatter + Install rust-src, needed by developer tools and for build-std (cross) Bootstrap using installed rust compiler Use the system LLVM install Build support for the wasm32-unknown-unknown target diff --git a/dev-lang/rust/rust-1.56.1.ebuild b/dev-lang/rust/rust-1.56.1.ebuild index b0dc62b63ef..ebe0f6c8037 100644 --- a/dev-lang/rust/rust-1.56.1.ebuild +++ b/dev-lang/rust/rust-1.56.1.ebuild @@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" -IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" # Please keep the LLVM dependency block separate. Since LLVM is slotted, # we need to *really* make sure we're not pulling more than one slot @@ -119,6 +119,7 @@ RDEPEND="${DEPEND} REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) miri? ( nightly ) parallel-compiler? ( nightly ) + rls? ( rust-src ) test? ( ${ALL_LLVM_TARGETS[*]} ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 ) @@ -277,11 +278,14 @@ src_configure() { tools="\"miri\",$tools" fi if use rls; then - tools="\"rls\",\"analysis\",\"src\",$tools" + tools="\"rls\",\"analysis\",$tools" fi if use rustfmt; then tools="\"rustfmt\",$tools" fi + if use rust-src; then + tools="\"src\",$tools" + fi local rust_stage0_root if use system-bootstrap; then