summaryrefslogtreecommitdiff
path: root/lang/rust-nightly
diff options
context:
space:
mode:
Diffstat (limited to 'lang/rust-nightly')
-rw-r--r--lang/rust-nightly/Makefile8
-rw-r--r--lang/rust-nightly/distinfo18
-rw-r--r--lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs10
-rw-r--r--lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs22
-rw-r--r--lang/rust-nightly/files/patch-vendor_cc.rs49
-rw-r--r--lang/rust-nightly/files/patch-vendor_git2-0.20.2_src_lib.rs (renamed from lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs)4
6 files changed, 37 insertions, 74 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index ad6f7d553ba4..82f1eaed2d13 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.89.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION= 1.94.0.${NIGHTLY_DATE:C,-,,g}
# Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
PORTREVISION= 0
PKGNAMESUFFIX= -nightly
@@ -8,14 +8,14 @@ DISTNAME= rustc-nightly-src
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures
-CONFLICTS_INSTALL= rust
+CONFLICTS_INSTALL= rust rust188
MASTERDIR= ${.CURDIR}/../rust
PATCHDIR= ${.CURDIR}/files
DISTINFO_FILE= ${.CURDIR}/distinfo
-NIGHTLY_DATE= 2025-05-12
-BOOTSTRAPS_DATE= 2025-04-02
+NIGHTLY_DATE= 2025-12-07
+BOOTSTRAPS_DATE= 2025-10-28
RUST_BOOTSTRAP_VERSION= beta
.include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 85dd9fa03e11..f98e0ce89e9e 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1747135686
-SHA256 (rust/2025-05-12/rustc-nightly-src.tar.xz) = b5707eca97561a1f59e19d0d0d1d2ee9d930e5bccdb00ce569067825ef3e1746
-SIZE (rust/2025-05-12/rustc-nightly-src.tar.xz) = 283351272
-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
-SIZE (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28281300
-SHA256 (rust/2025-04-02/cargo-beta-x86_64-unknown-freebsd.tar.xz) = eae168df54ddfe95db669c205ae97baa902056722856fa174758ebd058168a95
-SIZE (rust/2025-04-02/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10577536
+TIMESTAMP = 1765203500
+SHA256 (rust/2025-12-07/rustc-nightly-src.tar.xz) = 20d47ab1b0d2b64cfb40e833c9ff139760242ce3039f796a23958506d1b6fc8f
+SIZE (rust/2025-12-07/rustc-nightly-src.tar.xz) = 270853088
+SHA256 (rust/2025-10-28/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 015e02fb99098c31d502738e9e525d48ac6ca386e16f3ecb55235c7268d4abe7
+SIZE (rust/2025-10-28/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 90463808
+SHA256 (rust/2025-10-28/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = fd7c7b75a50833650f131a6a676df90dcd57c4784654aee12ce594846da1c219
+SIZE (rust/2025-10-28/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28563240
+SHA256 (rust/2025-10-28/cargo-beta-x86_64-unknown-freebsd.tar.xz) = beb5587235e8ff471a8eb9fd84ae5cf4380e7ec9b00ab03dc0c549be0e661dd0
+SIZE (rust/2025-10-28/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 11471512
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs
index 6d7f6d612496..8953ab44bbf2 100644
--- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs
+++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs
@@ -4,14 +4,16 @@ 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/src/core/build_steps/install.rs.orig 2022-05-01 20:28:31 UTC
+XXX: Shouldn't we instead just avoid adding docs-*-wasm* to _COMPONENTS in lang/rust/Makefile?
+
+--- src/bootstrap/src/core/build_steps/install.rs.orig 2025-08-24 19:46:17 UTC
+++ src/bootstrap/src/core/build_steps/install.rs
-@@ -138,7 +138,7 @@ macro_rules! install {
+@@ -206,7 +206,7 @@ install!((self, builder, _config),
}
install!((self, builder, _config),
-- Docs, path = "src/doc", _config.docs, only_hosts: false, {
-+ Docs, path = "src/doc", _config.docs, only_hosts: true, {
+- Docs, path = "src/doc", _config.docs, IS_HOST: false, {
++ Docs, path = "src/doc", _config.docs, IS_HOST: true, {
let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
};
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
index fcbf2f47c9ca..4b024680070c 100644
--- 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
@@ -1,14 +1,14 @@
---- src/bootstrap/src/core/config/config.rs.orig 2025-04-01 18:22:03 UTC
+--- src/bootstrap/src/core/config/config.rs.orig 2025-08-24 19:46:17 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}"
-- ));
-+ );
- }
+@@ -1991,9 +1991,9 @@ pub fn check_stage0_version(
+ || 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 3e9a42a7f8dd..441cfdc2455a 100644
--- a/lang/rust-nightly/files/patch-vendor_cc.rs
+++ b/lang/rust-nightly/files/patch-vendor_cc.rs
@@ -8,21 +8,8 @@ until LLVM can be updated to use libc++ by default.
https://reviews.llvm.org/D77776
---- vendor/cc-1.0.99/src/tool.rs.orig 2024-12-10 13:16:09 UTC
-+++ vendor/cc-1.0.99/src/tool.rs
-@@ -167,9 +167,7 @@ impl Tool {
-
- match (clang, accepts_cl_style_flags, gcc) {
- (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
-- (true, false, _) => Ok(ToolFamily::Clang {
-- zig_cc: is_zig_cc(path, cargo_output),
-- }),
-+ (true, false, _) => Ok(ToolFamily::Gnu),
- (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.2.0/src/tool.rs.orig 2024-12-10 13:16:09 UTC
-+++ vendor/cc-1.2.0/src/tool.rs
+--- vendor/cc-1.1.18/src/tool.rs.orig 2025-06-08 20:17:28 UTC
++++ vendor/cc-1.1.18/src/tool.rs
@@ -174,9 +174,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -34,35 +21,9 @@ 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.16/src/tool.rs.orig 2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.16/src/tool.rs
-@@ -141,9 +141,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.17/src/tool.rs.orig 2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.17/src/tool.rs
-@@ -141,9 +141,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.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 {
+--- 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 {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
(clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
diff --git a/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs b/lang/rust-nightly/files/patch-vendor_git2-0.20.2_src_lib.rs
index 1676f0c23188..116d0b1fd583 100644
--- a/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs
+++ b/lang/rust-nightly/files/patch-vendor_git2-0.20.2_src_lib.rs
@@ -1,5 +1,5 @@
---- vendor/git2-0.20.0/src/lib.rs.orig 2025-02-21 20:02:44 UTC
-+++ vendor/git2-0.20.0/src/lib.rs
+--- vendor/git2-0.20.2/src/lib.rs.orig 2025-02-21 20:02:44 UTC
++++ vendor/git2-0.20.2/src/lib.rs
@@ -759,6 +759,7 @@ fn init() {
unix,
not(target_os = "macos"),
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-24 16:19:16 +0000