From nobody Tue Nov 28 12:56:49 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfjC53TNnz52q1Q; Tue, 28 Nov 2023 12:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfjC532sDz4HK8; Tue, 28 Nov 2023 12:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701176209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NytIy3DB5woeoxCP3ZktDpJDh1rGVQAsnNfmSgVzByY=; b=Y3A4BZ4L4t3x14Pna7PW9ma9NxxoMSdV0hXYTk6D9XKPlwY7b2fuSOAASQYHOQOjIPje1l yg0/6UyCSakIt3gXHE/WveSh/6fbC2ES5KR+znHcN85UsC3iA00DX1NOD+zdwP8hntWqtK SF7aeR6VD3C96aGTI8sEAVA9SziUwfOdP489Zvqs2Af9EhNK4itHe7usxInLhuxPt4wVWt FMA19RH4iwhLI4Ba9fRjKNMmgj6ACPjSfm+7lHALapRgQVgp+bEnZVDvl86qV3RyO87+C2 E2HvdCEqwTzPEs4g6Vx4Ssc+cwGqYZaHN0MA74Y7RB50ssvdS2LdDf9uUMig2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701176209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NytIy3DB5woeoxCP3ZktDpJDh1rGVQAsnNfmSgVzByY=; b=u+AZ0lAoAwsRjQ46IYS3AdCXjE2e8Zt9QQ53yl6KeWj1uyp/pG/nds+ySINKo4PLpyihBZ VThuGOFwQC8scyewYVB3fn70UJVkL4sY5TzrBs//3Hv5303ZIkjAZY8sNFEijWBqt31oBB SaLl0jwx9vCzmkPlaJceyuHJnpJ8Ue08Cpp+Lkk31PHV2y4TlTGgUeeo+mRvZn2KvgtUF4 JgNWU9teqEsnDVxmDOOzT8Ji7L2jlbIdSg2qudBPYsV460x/+fgSyXfoYB1VzwiTkPt3Xx rZpOjOlp1dHO8GZ/OxKgmz7iO49taqBtGEO5QuBoXLyrOVR+hIZ6hge1PAKsdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701176209; a=rsa-sha256; cv=none; b=eTx8xLOvYd8AEA6jd9frCs7Lf8NcdEII4MSrngKvUoVmrrO4SYoGFf77asZy/hYpbXcRSC ChMoHusHsIlFQHo3D8hej4STabRKtTjdXTKXymyvLreEpvdguARKjpe/DYn2GX266SngU6 pav+rM8IlB/OX8D8ojyaGND9KIHpHMixt8iGg7L+AipeDoBMB1H9QWXiKUoTBF8x5+YPUG KFlrwrUT7auaE73Zv2OKUNk0qyo8Cyim+bJPttloMLT2EAWpDv7GbPokQgEZGWx+U1CtP8 fgynQl+dIG7ruwQYwhaw1VNtzof+Ab2ErKNKcct/KY5CsGf0RdYy50eLsn5cqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfjC525Tbz6p3; Tue, 28 Nov 2023 12:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASCun40057454; Tue, 28 Nov 2023 12:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASCun4c057451; Tue, 28 Nov 2023 12:56:49 GMT (envelope-from git) Date: Tue, 28 Nov 2023 12:56:49 GMT Message-Id: <202311281256.3ASCun4c057451@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 2ea8ee915d75 - main - lang/rust-nightly: Update to 1.76.0.20231125 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ea8ee915d7563f0798396236b994698bcc55ce8 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ea8ee915d7563f0798396236b994698bcc55ce8 commit 2ea8ee915d7563f0798396236b994698bcc55ce8 Author: Mikael Urankar AuthorDate: 2023-11-28 12:40:09 +0000 Commit: Mikael Urankar CommitDate: 2023-11-28 12:53:45 +0000 lang/rust-nightly: Update to 1.76.0.20231125 https://github.com/rust-lang/rust/compare/e0d7ed1f453fb54578cc96dfea859b0e7be15016...f5dc2653fdd8b5d177b2ccbd84057954340a89fc --- lang/rust-nightly/Makefile | 6 +++--- lang/rust-nightly/distinfo | 18 +++++++++--------- ...er_rustc__target_src_spec_i686__unknown__freebsd.rs | 10 +++++----- ...tch-src_bootstrap_src_core_build__steps_install.rs} | 4 ++-- ...tch-src_tools_cargo_src_cargo_sources_git_source.rs | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index eb05b8c6b487..0f88d3430809 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,5 +1,5 @@ # Run update.sh to update to the latest nightly -PORTVERSION= 1.75.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.76.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly @@ -14,8 +14,8 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2023-10-02 -BOOTSTRAPS_DATE= 2023-08-22 +NIGHTLY_DATE= 2023-11-25 +BOOTSTRAPS_DATE= 2023-11-13 RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index c10146b080a5..22f30ce45a19 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1696339791 -SHA256 (rust/2023-10-02/rustc-nightly-src.tar.xz) = f64ee88a7d9d4ae552d8f7d07606740032a2c0a64ac4b2c7f37a27e6be335f15 -SIZE (rust/2023-10-02/rustc-nightly-src.tar.xz) = 155897484 -SHA256 (rust/2023-08-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = b21b5e26ccb28c2bf8a089a6f62abc4d10d6a4aabadf694aff8273150e6e7673 -SIZE (rust/2023-08-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 74331332 -SHA256 (rust/2023-08-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 9653bf3ea33bf9502eb90b72c0696af0cc90dea54e9d6e5be97783db3e8286bc -SIZE (rust/2023-08-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 24907124 -SHA256 (rust/2023-08-22/cargo-beta-x86_64-unknown-freebsd.tar.xz) = c9ae52f1212ff635f3300befbd33e575c308e14ff13f0ac30d5d97a3797788f1 -SIZE (rust/2023-08-22/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 8399356 +TIMESTAMP = 1701007367 +SHA256 (rust/2023-11-25/rustc-nightly-src.tar.xz) = 3538acb92c0497ae747cff254086572c1f57ee03e92ab8a12247cc162f6776d2 +SIZE (rust/2023-11-25/rustc-nightly-src.tar.xz) = 162679888 +SHA256 (rust/2023-11-13/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c2094e3b40e602ab804e875ec1b1ab7e91f0ff499bc6c1e4b2a957ed4d136ab8 +SIZE (rust/2023-11-13/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 74020428 +SHA256 (rust/2023-11-13/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28c43fb5b7bf4c254ef61c5bc39da09e81881e01261a8a3346968170c8774581 +SIZE (rust/2023-11-13/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 24136416 +SHA256 (rust/2023-11-13/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 67f1bb5008080c00f4f22be794b1fa63a88c1503187dc3396260aa73d52a1f7c +SIZE (rust/2023-11-13/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 8519764 diff --git a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs index 992e475acf91..c1f57467f264 100644 --- a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs +++ b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs @@ -1,11 +1,11 @@ ---- compiler/rustc_target/src/spec/i686_unknown_freebsd.rs.orig 2021-10-17 19:23:05 UTC -+++ compiler/rustc_target/src/spec/i686_unknown_freebsd.rs +--- compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs.orig 2023-11-27 08:52:00 UTC ++++ compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs @@ -2,7 +2,7 @@ pub fn target() -> Target { pub fn target() -> Target { - let mut base = super::freebsd_base::opts(); + let mut base = base::freebsd::opts(); - base.cpu = "pentium4".into(); + base.cpu = "pentiumpro".into(); base.max_atomic_width = Some(64); - let pre_link_args = base.pre_link_args.entry(LinkerFlavor::Gcc).or_default(); - pre_link_args.push("-m32".into()); + base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-znotext"]); + base.stack_probes = StackProbeType::X86; diff --git a/lang/rust-nightly/files/patch-src_bootstrap_install.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs similarity index 81% rename from lang/rust-nightly/files/patch-src_bootstrap_install.rs rename to lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs index e3afe8bad00c..6d7f6d612496 100644 --- a/lang/rust-nightly/files/patch-src_bootstrap_install.rs +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs @@ -4,8 +4,8 @@ It otherwise wastes significant time (there are a lot of individual files) and stages host docs, wasm docs, which unstages the host docs first. ---- src/bootstrap/install.rs.orig 2022-05-01 20:28:31 UTC -+++ src/bootstrap/install.rs +--- src/bootstrap/src/core/build_steps/install.rs.orig 2022-05-01 20:28:31 UTC ++++ src/bootstrap/src/core/build_steps/install.rs @@ -138,7 +138,7 @@ macro_rules! install { } diff --git a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs index f1f4ffd179c7..fc3b22aebde1 100644 --- a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs +++ b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs @@ -13,9 +13,9 @@ be stabilized first. It will be available in Rust 1.56. --- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2021-10-04 20:59:57 UTC +++ src/tools/cargo/src/cargo/sources/git/source.rs -@@ -92,6 +92,9 @@ impl<'cfg> Source for GitSource<'cfg> { +@@ -195,6 +195,9 @@ impl<'cfg> Source for GitSource<'cfg> { kind: QueryKind, - f: &mut dyn FnMut(Summary), + f: &mut dyn FnMut(IndexSummary), ) -> Poll> { + if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { + return Poll::Ready(Ok(())); @@ -23,10 +23,10 @@ be stabilized first. It will be available in Rust 1.56. if let Some(src) = self.path_source.as_mut() { src.query(dep, kind, f) } else { -@@ -113,6 +116,10 @@ impl<'cfg> Source for GitSource<'cfg> { - +@@ -217,6 +220,10 @@ impl<'cfg> Source for GitSource<'cfg> { fn block_until_ready(&mut self) -> CargoResult<()> { if self.path_source.is_some() { + self.mark_used(None)?; + return Ok(()); + } +