From nobody Sat Apr 09 10:51:24 2022 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 2921A1AAC524; Sat, 9 Apr 2022 10:51:25 +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 4KbBkP0chFz3NN7; Sat, 9 Apr 2022 10:51:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649501485; 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=vjJ2X6l2I3A8UoLwTjjcTVjQ4cFqcPcyhPWOtE06TNY=; b=iXSGTG2rDqRbSw0WwI0F0wiBEsCLBlt+xVqaTK7WbkkZfkMt4/aIiI/1JQ4ZZNsyhNjPdX j9c4wP1o/Zyxdu/VGUTPZ/s8INleLcKoJVUgsQNa0G24B4EvIYhPL4TjUCvzI4NUR7Sor6 hQ7q7EGbwHGDuYggh0Tk2RMRmwvnz3kNmYQGOA3JHbi0WGplQXu2h0suyDCIhhAec9SeE8 AoneIccsZ9t1d1E43K2hSpWrAPkLpORkgAmr0jy1BMVVJK1JKBHQSfsGBSmznSYPUdORit F4KbqK/rn3Ix+VehUmU4BjZBsPTkTVHnrh9Tr28aQxTI+bT8GRlG7m3nC+zftQ== 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 E95A618915; Sat, 9 Apr 2022 10:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 239ApOWG012674; Sat, 9 Apr 2022 10:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 239ApOBF012673; Sat, 9 Apr 2022 10:51:24 GMT (envelope-from git) Date: Sat, 9 Apr 2022 10:51:24 GMT Message-Id: <202204091051.239ApOBF012673@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: 1df1f9c9c063 - main - lang/rust-nightly: Update to 1.62.0.20220409 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: 1df1f9c9c0637ccff6b9468ab449fabc96b70d6f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649501485; 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=vjJ2X6l2I3A8UoLwTjjcTVjQ4cFqcPcyhPWOtE06TNY=; b=yT5pNmorOHeR/4veXAiNWmw9MXz7OMujDXA6VqVkVbF1zLMsqTVlIrLKYWvbKEC1l8flIB 7HjddVpdUo10dexMdbFscmH1VguBa0pTWr8ySZGWkCoRPysM/MnmY7b28rYKHcaP9YOd6d h2KY5ZdD9yVZ27oy2OGuEl/l1/VcNmqpdqtK8QYym1H5F8RzeNrNK8P2IabGoct+ZcreB5 I3Pzlh8L8u4NMGwmiuQQMos93aS8d/7WRPQR9KOvqQjO5sGqQtU+SfQ0rD4YqBcmc02UBc GWRa+tY8OJBPoQ/Z6WZGg4NPxfN2g+AcYyUCWTg7ZvJwiHw2Y+kxXXO2YHa6JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649501485; a=rsa-sha256; cv=none; b=tBZwbRq76LOIuNYKJpHIGzM+sxyvxsYn4quPkJjYXRUXHMTFveQRa2abCkZydsTE8Cm2ze quX+EHAr7fDNpa+sIGOc5Fpb3bqqz5jr659+qNs4/XKMOgT73PTQh9rpoRZx//v3e91mqd 4RvtXXcN1cHrTfd3oLstplwUqLa2ONyyRKO0D+Cv1LxZytde3nhfCexkZfUdnSCAJOy0Nq WRwqFvr6yKyAmBoqw9olQpFzkGXt3NNtGqId68qOUbwzkxHDPU6PW1oGWTTYQ+gv4b6e4Q 6P+NjdGQVcAQAqwmmQOBC8XKHTw8e6fOXs5m9Gmp5mLe73yiOkZGEvYKCvGeeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=1df1f9c9c0637ccff6b9468ab449fabc96b70d6f commit 1df1f9c9c0637ccff6b9468ab449fabc96b70d6f Author: Mikael Urankar AuthorDate: 2022-04-09 09:11:44 +0000 Commit: Mikael Urankar CommitDate: 2022-04-09 10:51:22 +0000 lang/rust-nightly: Update to 1.62.0.20220409 Changes: https://github.com/rust-lang/rust/compare/4e8fb743ccbec27344b2dd42de7057f41d4ebfdd...f4a7ce997a1d7546d2b737f8b87d36907bcea2ad --- lang/rust-nightly/Makefile | 6 +-- lang/rust-nightly/distinfo | 18 ++++----- ...ustc__target_src_spec_i686__unknown__freebsd.rs | 8 ++-- ...src_tools_cargo_src_cargo_sources_git_source.rs | 43 +++++++++++----------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 50b388ef8add..72cc3b06a6ff 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,7 +1,7 @@ # Created by: Jean-Sébastien Pédron # Run update.sh to update to the latest nightly -PORTVERSION= 1.60.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.62.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly @@ -18,8 +18,8 @@ DISTINFO_FILE= ${.CURDIR}/distinfo OPTIONS_EXCLUDE= DOCS -NIGHTLY_DATE= 2022-02-04 -BOOTSTRAPS_DATE= 2022-01-28 +NIGHTLY_DATE= 2022-04-09 +BOOTSTRAPS_DATE= 2022-04-05 RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 9133063f050a..6e397a600a31 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1644044204 -SHA256 (rust/2022-02-04/rustc-nightly-src.tar.xz) = b4bc57c3ac6f4511393891d2fac8f47e7c94a85f8b22707dea7f829e8716c9ce -SIZE (rust/2022-02-04/rustc-nightly-src.tar.xz) = 128936328 -SHA256 (rust/2022-01-28/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 3506fc1b57f8da75e93f48d00c49f4d0cdf61b459955449a87d1a7fc051c40dd -SIZE (rust/2022-01-28/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 76199452 -SHA256 (rust/2022-01-28/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 87cdacf1caa7fb3656be04fb3b37f21541b2e8eed214bb5822c0723fe9f23067 -SIZE (rust/2022-01-28/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 26324336 -SHA256 (rust/2022-01-28/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 800ac9e61fdff1e046c8bf5708fde53a8ea96ebb9c74d1268dbb15518fa1a2cb -SIZE (rust/2022-01-28/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6396872 +TIMESTAMP = 1649492829 +SHA256 (rust/2022-04-09/rustc-nightly-src.tar.xz) = b31ec602bf925d2af2ea242ca7d539b5e25332590d4b41da188d997cb7ce3fc3 +SIZE (rust/2022-04-09/rustc-nightly-src.tar.xz) = 136886400 +SHA256 (rust/2022-04-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 5b461322da60b08554f2557deb69485d3991abf13b75750a307c004d6547a42f +SIZE (rust/2022-04-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 77575576 +SHA256 (rust/2022-04-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = d457f1c09dd446e30e94e4bcb1e3b5fde9cc54080cbe5e0a329ee810ab07d312 +SIZE (rust/2022-04-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27789452 +SHA256 (rust/2022-04-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 832c90d532ffcba10039f1244bf06c7121ddd3b7fd7c0d913b62fd0ad82e1dce +SIZE (rust/2022-04-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6743924 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 308bb0d4b551..992e475acf91 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 -@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, StackProbeType, Target +@@ -2,7 +2,7 @@ pub fn target() -> Target { pub fn target() -> Target { let mut base = super::freebsd_base::opts(); -- base.cpu = "pentium4".to_string(); -+ base.cpu = "pentiumpro".to_string(); +- 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".to_string()); + pre_link_args.push("-m32".into()); 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 7e0f0f6eca4d..ee09c8d53031 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,33 +13,34 @@ 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 -@@ -84,6 +84,9 @@ impl<'cfg> Debug for GitSource<'cfg> { +@@ -86,6 +86,9 @@ impl<'cfg> Source for GitSource<'cfg> { impl<'cfg> Source for GitSource<'cfg> { - fn query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> CargoResult<()> { + fn query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> Poll> { + if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { -+ return Ok(()); ++ return Poll::Ready(Ok(())); + } - let src = self - .path_source - .as_mut() -@@ -92,6 +95,9 @@ impl<'cfg> Source for GitSource<'cfg> { - } - - fn fuzzy_query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> CargoResult<()> { + if let Some(src) = self.path_source.as_mut() { + src.query(dep, f) + } else { +@@ -98,6 +101,9 @@ impl<'cfg> Source for GitSource<'cfg> { + dep: &Dependency, + f: &mut dyn FnMut(Summary), + ) -> Poll> { + if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { -+ return Ok(()); ++ return Poll::Ready(Ok(())); + } - let src = self - .path_source - .as_mut() -@@ -112,6 +118,9 @@ impl<'cfg> Source for GitSource<'cfg> { - } + if let Some(src) = self.path_source.as_mut() { + src.fuzzy_query(dep, f) + } else { +@@ -119,6 +125,10 @@ impl<'cfg> Source for GitSource<'cfg> { - fn update(&mut self) -> CargoResult<()> { -+ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { + fn block_until_ready(&mut self) -> CargoResult<()> { + if self.path_source.is_some() { + return Ok(()); + } - let git_path = self.config.git_path(); - let git_path = self.config.assert_package_cache_locked(&git_path); - let db_path = git_path.join("db").join(&self.ident); ++ ++ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { + return Ok(()); + } +