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 905F9158091 for ; Thu, 2 Jun 2022 01:44:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D82C7E07C5; Thu, 2 Jun 2022 01:44:50 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC2BAE07C5 for ; Thu, 2 Jun 2022 01:44:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2633D341D21 for ; Thu, 2 Jun 2022 01:44:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28B5A4E3 for ; Thu, 2 Jun 2022 01:44:47 +0000 (UTC) From: "Quentin Retornaz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Quentin Retornaz" Message-ID: <1654134244.74225b53bf6c9c01b7f80b4dc47f8046db125802.quentin@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-lang/rust/metadata.xml dev-lang/rust/rust-1.59.0.ebuild dev-lang/rust/rust-1.60.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: quentin X-VCS-Committer-Name: Quentin Retornaz X-VCS-Revision: 74225b53bf6c9c01b7f80b4dc47f8046db125802 X-VCS-Branch: master Date: Thu, 2 Jun 2022 01:44:47 +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: dfe8bc8d-f107-4f50-bc61-5b2bdd1eabf5 X-Archives-Hash: 1f350abaf4c404f3de161d05906d2d75 commit: 74225b53bf6c9c01b7f80b4dc47f8046db125802 Author: orbea riseup net> AuthorDate: Wed Jun 1 22:36:17 2022 +0000 Commit: Quentin Retornaz retornaz com> CommitDate: Thu Jun 2 01:44:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=74225b53 dev-lang/rust: Update ebuilds Reduces the diff with the gentoo repo. Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/414 Signed-off-by: Quentin Retornaz retornaz.com> dev-lang/rust/metadata.xml | 13 ++++++++----- dev-lang/rust/rust-1.59.0.ebuild | 6 +++--- dev-lang/rust/rust-1.60.0.ebuild | 19 ++++++++++++++----- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml index 1e4ffdc..7219757 100644 --- a/dev-lang/rust/metadata.xml +++ b/dev-lang/rust/metadata.xml @@ -1,5 +1,5 @@ - + gyakovlev@gentoo.org @@ -11,13 +11,16 @@ Install clippy, Rust code linter - Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly) - Enable nightly (UNSTABLE) features - Build a multi-threaded rustc + Install dist tarballs (used for bootstrapping) + Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly, sometimes is broken) + Enable nightly (UNSTABLE) features (NOTE: it does not install nightly version, just enables features marked as nightly at time of release) + Build a multi-threaded rustc (experimental, not tested by upstream) + Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts) 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 + Use the system LLVM installation Build support for the wasm32-unknown-unknown target diff --git a/dev-lang/rust/rust-1.59.0.ebuild b/dev-lang/rust/rust-1.59.0.ebuild index bb48968..33eb0ea 100644 --- a/dev-lang/rust/rust-1.59.0.ebuild +++ b/dev-lang/rust/rust-1.59.0.ebuild @@ -192,10 +192,10 @@ bootstrap_rust_version_check() { } pre_build_checks() { - local M=4096 - # multiply requirements by 1.5 if we are doing x86-multilib + local M=8192 + # multiply requirements by 1.3 if we are doing x86-multilib if use amd64; then - M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 )) + M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 )) fi M=$(( $(usex clippy 128 0) + ${M} )) M=$(( $(usex miri 128 0) + ${M} )) diff --git a/dev-lang/rust/rust-1.60.0.ebuild b/dev-lang/rust/rust-1.60.0.ebuild index 65daf58..a1a5c44 100644 --- a/dev-lang/rust/rust-1.60.0.ebuild +++ b/dev-lang/rust/rust-1.60.0.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 dist doc miri nightly parallel-compiler rls rustfmt rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="clippy cpu_flags_x86_sse2 debug dist doc miri nightly parallel-compiler profiler 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 @@ -190,10 +190,10 @@ bootstrap_rust_version_check() { } pre_build_checks() { - local M=4096 - # multiply requirements by 1.5 if we are doing x86-multilib + local M=8192 + # multiply requirements by 1.3 if we are doing x86-multilib if use amd64; then - M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 )) + M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 )) fi M=$(( $(usex clippy 128 0) + ${M} )) M=$(( $(usex miri 128 0) + ${M} )) @@ -280,6 +280,9 @@ src_configure() { if use miri; then tools="\"miri\",$tools" fi + if use profiler; then + tools="\"rust-demangler\",$tools" + fi if use rls; then tools="\"rls\",\"analysis\",$tools" fi @@ -342,7 +345,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = false + profiler = $(toml_usex profiler) cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -418,6 +421,8 @@ src_configure() { if use wasm; then cat <<- _EOF_ >> "${S}"/config.toml [target.wasm32-unknown-unknown] + # wasm target does not have profiler_builtins https://bugs.gentoo.org/848483 + profiler = false linker = "$(usex system-llvm lld rust-lld)" _EOF_ fi @@ -606,6 +611,7 @@ src_install() { use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) + use profiler && symlinks+=( rust-demangler ) use rls && symlinks+=( rls ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) @@ -665,6 +671,9 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi + if use profiler; then + echo /usr/bin/rust-demangler >> "${T}/provider-${P}" + fi if use rls; then echo /usr/bin/rls >> "${T}/provider-${P}" fi