summaryrefslogtreecommitdiff
path: root/lang/rust-nightly
diff options
context:
space:
mode:
Diffstat (limited to 'lang/rust-nightly')
-rw-r--r--lang/rust-nightly/Makefile12
-rw-r--r--lang/rust-nightly/distinfo18
-rw-r--r--lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs4
-rw-r--r--lang/rust-nightly/files/patch-vendor_cc.rs93
-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
5 files changed, 100 insertions, 31 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index ad6f7d553ba4..3d0c2fa874f6 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.91.0.${NIGHTLY_DATE:C,-,,g}
# Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
PORTREVISION= 0
PKGNAMESUFFIX= -nightly
@@ -8,14 +8,18 @@ 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-08-05
+BOOTSTRAPS_DATE= 2025-06-24
RUST_BOOTSTRAP_VERSION= beta
+post-configure:
+ # remove after bootstraps are updated to version higher than 2025-07-27
+ @${REINPLACE_CMD} -e '/ccache=/d' ${WRKSRC}/config.toml
+
.include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 85dd9fa03e11..8dbff4c87479 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 = 1754482083
+SHA256 (rust/2025-08-05/rustc-nightly-src.tar.xz) = 428963a5586248c0f088dff1dda048060b447c2bf187ca2326b62af47c80f9fc
+SIZE (rust/2025-08-05/rustc-nightly-src.tar.xz) = 272353928
+SHA256 (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 71e9e3a1d1f5e8dc98403c2a6695c969908ba0cde594c4e20249fe81b67d62d1
+SIZE (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88377504
+SHA256 (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 7cc4adb3c102eac53916b28c0dad40bd095e19ea3fd0430e84a2e0b094445809
+SIZE (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28253396
+SHA256 (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = be762a368c6dfbe47a0f8c4b09cea1755a6d311f713b57b57a87276c88e5c34d
+SIZE (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10790116
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..a556833eed1e 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,6 +1,6 @@
---- src/bootstrap/src/core/config/config.rs.orig 2025-04-01 18:22:03 UTC
+--- src/bootstrap/src/core/config/config.rs.orig 2025-06-08 20:17:28 UTC
+++ src/bootstrap/src/core/config/config.rs
-@@ -3016,9 +3016,9 @@ impl Config {
+@@ -1459,9 +1459,9 @@ impl Config {
|| source_version.minor == stage0_version.minor + 1)))
{
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs
index 3e9a42a7f8dd..11682cd5f1f6 100644
--- a/lang/rust-nightly/files/patch-vendor_cc.rs
+++ b/lang/rust-nightly/files/patch-vendor_cc.rs
@@ -8,19 +8,19 @@ 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 {
+--- 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) {
- (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
-- (true, false, _) => Ok(ToolFamily::Clang {
+ 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, _) => 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");
++ (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 {
@@ -34,6 +34,19 @@ 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.13/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.13/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.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 {
@@ -47,8 +60,60 @@ 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.17/src/tool.rs.orig 2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.17/src/tool.rs
+--- vendor/cc-1.2.19/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.19/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.20/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.20/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.23/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.23/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.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.26/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.27/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.27/src/tool.rs
@@ -141,9 +141,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -60,8 +125,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.21/src/tool.rs.orig 2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.21/src/tool.rs
+--- vendor/cc-1.2.31/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.31/src/tool.rs
@@ -141,9 +141,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
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-09-07 12:45:59 +0000