git: 65175e883843 - main - lang/rust-nightly: update 1.88.0.20250427 → 1.89.0.20250511
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 12 May 2025 15:37:27 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=65175e88384344ecff410b8b3fe6c6cd952c96fa
commit 65175e88384344ecff410b8b3fe6c6cd952c96fa
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2025-05-12 12:55:30 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2025-05-12 15:37:22 +0000
lang/rust-nightly: update 1.88.0.20250427 → 1.89.0.20250511
Approved by: rust (implicit)
---
lang/rust-nightly/Makefile | 4 ++--
lang/rust-nightly/distinfo | 6 +++---
.../files/patch-src_bootstrap_src_core_config_config.rs | 14 ++++++++++++++
lang/rust-nightly/files/patch-vendor_cc.rs | 17 ++---------------
4 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index ddf0c6080ca0..a471ae71c1b7 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.88.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION= 1.89.0.${NIGHTLY_DATE:C,-,,g}
# Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
PORTREVISION= 0
PKGNAMESUFFIX= -nightly
@@ -14,7 +14,7 @@ MASTERDIR= ${.CURDIR}/../rust
PATCHDIR= ${.CURDIR}/files
DISTINFO_FILE= ${.CURDIR}/distinfo
-NIGHTLY_DATE= 2025-04-27
+NIGHTLY_DATE= 2025-05-11
BOOTSTRAPS_DATE= 2025-04-02
RUST_BOOTSTRAP_VERSION= beta
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index b55fd74dcebc..4217c5534dcb 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1745842885
-SHA256 (rust/2025-04-27/rustc-nightly-src.tar.xz) = e91adec5f8e4344d038276a23b33ba7140b66013b983c42dbeb402a2d0aed98a
-SIZE (rust/2025-04-27/rustc-nightly-src.tar.xz) = 282336840
+TIMESTAMP = 1747040402
+SHA256 (rust/2025-05-11/rustc-nightly-src.tar.xz) = bad0ba118859ebbae36a64459ef6bded37d18e586aeaba8c9e4fc19816ba7c1d
+SIZE (rust/2025-05-11/rustc-nightly-src.tar.xz) = 283339704
SHA256 (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c8d0147c625faa5ce0e75c2509827bc4b190ad286e41411bce92023e00eb7a1d
SIZE (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88062036
SHA256 (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 8bef59b74196fa9f7839bb491f6b32d0761a45c8d7178980ee3afd80231b836e
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs
new file mode 100644
index 000000000000..fcbf2f47c9ca
--- /dev/null
+++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs
@@ -0,0 +1,14 @@
+--- src/bootstrap/src/core/config/config.rs.orig 2025-04-01 18:22:03 UTC
++++ src/bootstrap/src/core/config/config.rs
+@@ -3016,9 +3016,9 @@ impl Config {
+ || source_version.minor == stage0_version.minor + 1)))
+ {
+ let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
+- fail(&format!(
++ eprintln!(
+ "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}"
+- ));
++ );
+ }
+ }
+
diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs
index a535d9677b91..3e9a42a7f8dd 100644
--- a/lang/rust-nightly/files/patch-vendor_cc.rs
+++ b/lang/rust-nightly/files/patch-vendor_cc.rs
@@ -21,19 +21,6 @@ https://reviews.llvm.org/D77776
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
---- vendor/cc-1.1.22/src/tool.rs.orig 2024-12-10 13:16:09 UTC
-+++ vendor/cc-1.1.22/src/tool.rs
-@@ -174,9 +174,7 @@ impl Tool {
-
- match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
- (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
-- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
-- zig_cc: is_zig_cc(path, cargo_output),
-- }),
-+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
- (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
- (false, false, false, false, false) => {
- cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
--- vendor/cc-1.2.0/src/tool.rs.orig 2024-12-10 13:16:09 UTC
+++ vendor/cc-1.2.0/src/tool.rs
@@ -174,9 +174,7 @@ impl Tool {
@@ -73,8 +60,8 @@ https://reviews.llvm.org/D77776
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
(false, false, false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
---- vendor/cc-1.2.19/src/tool.rs.orig 2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.19/src/tool.rs
+--- vendor/cc-1.2.21/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.21/src/tool.rs
@@ -141,9 +141,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {