Skip to content

Commit 904c41f

Browse files
AMDmi3AMDmi3
committed
lang/rust-nightly: update 1.91.0.20250805 → 1.91.0.20250907
Approved by: rust (implicit)
1 parent 4fddd72 commit 904c41f

File tree

7 files changed

+61
-38
lines changed

7 files changed

+61
-38
lines changed

‎lang/rust-nightly/Makefile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ MASTERDIR= ${.CURDIR}/../rust
1414
PATCHDIR= ${.CURDIR}/files
1515
DISTINFO_FILE= ${.CURDIR}/distinfo
1616

17-
NIGHTLY_DATE= 2025-08-05
18-
BOOTSTRAPS_DATE= 2025-06-24
17+
NIGHTLY_DATE= 2025-09-07
18+
BOOTSTRAPS_DATE= 2025-08-05
1919
RUST_BOOTSTRAP_VERSION= beta
2020

21-
post-configure:
22-
# remove after bootstraps are updated to version higher than 2025-07-27
23-
@${REINPLACE_CMD} -e '/ccache=/d' ${WRKSRC}/config.toml
24-
2521
.include "${MASTERDIR}/Makefile"

‎lang/rust-nightly/distinfo‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
TIMESTAMP = 1754482083
2-
SHA256 (rust/2025-08-05/rustc-nightly-src.tar.xz) = 428963a5586248c0f088dff1dda048060b447c2bf187ca2326b62af47c80f9fc
3-
SIZE (rust/2025-08-05/rustc-nightly-src.tar.xz) = 272353928
4-
SHA256 (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 71e9e3a1d1f5e8dc98403c2a6695c969908ba0cde594c4e20249fe81b67d62d1
5-
SIZE (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88377504
6-
SHA256 (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 7cc4adb3c102eac53916b28c0dad40bd095e19ea3fd0430e84a2e0b094445809
7-
SIZE (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28253396
8-
SHA256 (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = be762a368c6dfbe47a0f8c4b09cea1755a6d311f713b57b57a87276c88e5c34d
9-
SIZE (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10790116
1+
TIMESTAMP = 1757341820
2+
SHA256 (rust/2025-09-07/rustc-nightly-src.tar.xz) = b2e82674b09400cce62f8b8b6c16c09dc0cd035f1577dc270bcc713872763943
3+
SIZE (rust/2025-09-07/rustc-nightly-src.tar.xz) = 284060052
4+
SHA256 (rust/2025-08-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = cdfe207645068b4659b0f979cae177723c5f211084f45ae9180b2d93ee83fce6
5+
SIZE (rust/2025-08-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 87833828
6+
SHA256 (rust/2025-08-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = bd48292b8582167a5e89ebe521c9754495403968c184b925df8b2ec1da344fc3
7+
SIZE (rust/2025-08-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 30795804
8+
SHA256 (rust/2025-08-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 11e1a51740a728f5825364a8679b28454a68e7efc96320730f9b58a8fc2e6fae
9+
SIZE (rust/2025-08-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 11419484

‎lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ It otherwise wastes significant time (there are a lot of individual
44
files) and stages host docs, wasm docs, which unstages the host
55
docs first.
66

7-
--- src/bootstrap/src/core/build_steps/install.rs.orig 2022-05-01 20:28:31 UTC
7+
XXX: Shouldn't we instead just avoid adding docs-*-wasm* to _COMPONENTS in lang/rust/Makefile?
8+
9+
--- src/bootstrap/src/core/build_steps/install.rs.orig 2025-08-24 19:46:17 UTC
810
+++ src/bootstrap/src/core/build_steps/install.rs
9-
@@ -138,7 +138,7 @@ macro_rules! install {
11+
@@ -206,7 +206,7 @@ install!((self, builder, _config),
1012
}
1113

1214
install!((self, builder, _config),
13-
- Docs, path = "src/doc", _config.docs, only_hosts: false, {
14-
+ Docs, path = "src/doc", _config.docs, only_hosts: true, {
15+
- Docs, path = "src/doc", _config.docs, IS_HOST: false, {
16+
+ Docs, path = "src/doc", _config.docs, IS_HOST: true, {
1517
let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
1618
install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
1719
};

‎lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
--- src/bootstrap/src/core/config/config.rs.orig 2025-06-08 20:17:28 UTC
1+
--- src/bootstrap/src/core/config/config.rs.orig 2025-08-24 19:46:17 UTC
22
+++ src/bootstrap/src/core/config/config.rs
3-
@@ -1459,9 +1459,9 @@ impl Config {
4-
|| source_version.minor == stage0_version.minor + 1)))
5-
{
6-
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
7-
- fail(&format!(
8-
+ eprintln!(
9-
"Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}"
10-
- ));
11-
+ );
12-
}
3+
@@ -1991,9 +1991,9 @@ pub fn check_stage0_version(
4+
|| source_version.minor == stage0_version.minor + 1)))
5+
{
6+
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
7+
- fail(&format!(
8+
+ eprintln!(
9+
"Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}"
10+
- ));
11+
+ );
1312
}
13+
}
1414

‎lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
XXX: cc_tool is Gnu here because of patch-vendor_cc.rs. We need to seek need better solution.
2+
3+
--- src/bootstrap/src/core/sanity.rs.orig 2025-09-06 18:37:35 UTC
4+
+++ src/bootstrap/src/core/sanity.rs
5+
@@ -338,12 +338,12 @@ than building it.
6+
let cc_tool = build.cc_tool(*target);
7+
if !cc_tool.is_like_clang() && !cc_tool.path().ends_with("emcc") {
8+
// emcc works as well
9+
- panic!(
10+
- "Clang is required to build C code for Wasm targets, got `{}` instead\n\
11+
- this is because compiler-builtins is configured to build C source. Either \
12+
- ensure Clang is used, or adjust this configuration.",
13+
- cc_tool.path().display()
14+
- );
15+
+ //panic!(
16+
+ // "Clang is required to build C code for Wasm targets, got `{}` instead\n\
17+
+ // this is because compiler-builtins is configured to build C source. Either \
18+
+ // ensure Clang is used, or adjust this configuration.",
19+
+ // cc_tool.path().display()
20+
+ //);
21+
}
22+
}
23+

‎lang/rust-nightly/files/patch-vendor_cc.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ https://reviews.llvm.org/D77776
8686
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
8787
(false, false, false, false, false) => {
8888
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");
89-
--- vendor/cc-1.2.23/src/tool.rs.orig 2025-04-01 18:22:03 UTC
90-
+++ vendor/cc-1.2.23/src/tool.rs
89+
--- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC
90+
+++ vendor/cc-1.2.26/src/tool.rs
9191
@@ -141,9 +141,7 @@ impl Tool {
9292

9393
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -99,8 +99,8 @@ https://reviews.llvm.org/D77776
9999
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
100100
(false, false, false, false, false) => {
101101
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");
102-
--- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC
103-
+++ vendor/cc-1.2.26/src/tool.rs
102+
--- vendor/cc-1.2.28/src/tool.rs.orig 2025-04-01 18:22:03 UTC
103+
+++ vendor/cc-1.2.28/src/tool.rs
104104
@@ -141,9 +141,7 @@ impl Tool {
105105

106106
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -112,8 +112,8 @@ https://reviews.llvm.org/D77776
112112
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
113113
(false, false, false, false, false) => {
114114
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");
115-
--- vendor/cc-1.2.27/src/tool.rs.orig 2025-04-01 18:22:03 UTC
116-
+++ vendor/cc-1.2.27/src/tool.rs
115+
--- vendor/cc-1.2.33/src/tool.rs.orig 2025-04-01 18:22:03 UTC
116+
+++ vendor/cc-1.2.33/src/tool.rs
117117
@@ -141,9 +141,7 @@ impl Tool {
118118

119119
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -125,8 +125,8 @@ https://reviews.llvm.org/D77776
125125
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
126126
(false, false, false, false, false) => {
127127
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");
128-
--- vendor/cc-1.2.31/src/tool.rs.orig 2025-04-01 18:22:03 UTC
129-
+++ vendor/cc-1.2.31/src/tool.rs
128+
--- vendor/cc-1.2.35/src/tool.rs.orig 2025-04-01 18:22:03 UTC
129+
+++ vendor/cc-1.2.35/src/tool.rs
130130
@@ -141,9 +141,7 @@ impl Tool {
131131

132132
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {

‎lang/rust/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@ do-configure:
196196
.if ${PORT_OPTIONS:MLTO}
197197
@${ECHO_CMD} 'thin-lto=true' >> ${WRKSRC}/config.toml
198198
.endif
199+
.if !defined(PKGNAMESUFFIX)
199200
.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
200201
@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml
201202
.else
202203
@${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml
204+
.endif
203205
.endif
204206
@${ECHO_CMD} 'ninja=true' >> ${WRKSRC}/config.toml
205207
.if ${ARCH} == powerpc

0 commit comments

Comments
 (0)