diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index b348380479c0..86c524050a07 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,21 +1,21 @@ # Run update.sh to update to the latest nightly PORTVERSION= 1.84.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2024-11-02 +NIGHTLY_DATE= 2024-11-04 BOOTSTRAPS_DATE= 2024-10-16 RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index d9270f11b0a8..f058d1a076c9 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1730651068 -SHA256 (rust/2024-11-02/rustc-nightly-src.tar.xz) = 8590ac1f2646912da202179973e1c75fa92a414012be63b53ded727627eb5e59 -SIZE (rust/2024-11-02/rustc-nightly-src.tar.xz) = 354067020 +TIMESTAMP = 1730809089 +SHA256 (rust/2024-11-04/rustc-nightly-src.tar.xz) = c1e98dafef13dac41688c401054223c5f5c49777b4c663bd1b3bbb1cecfecd3a +SIZE (rust/2024-11-04/rustc-nightly-src.tar.xz) = 354595848 SHA256 (rust/2024-10-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 36c995c1dd55ab4501f250a77f27cce34330daa2a3e74129ce389aa23b4e3a05 SIZE (rust/2024-10-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 78540256 SHA256 (rust/2024-10-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 67e103b9742ebf2798fe8e2647a6755a1d253301fea13a5193ced5bc394b9a0c SIZE (rust/2024-10-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28904608 SHA256 (rust/2024-10-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 9e287f3d0c7e402dbc121cd737fd2360dfcd97fa886770aae93c07474494bb77 SIZE (rust/2024-10-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 9671024 diff --git a/lang/rust-nightly/files/patch-compiler_rustc__target_src_abi_call_powerpc64.rs b/lang/rust-nightly/files/patch-compiler_rustc__target_src_callconv_powerpc64.rs similarity index 60% rename from lang/rust-nightly/files/patch-compiler_rustc__target_src_abi_call_powerpc64.rs rename to lang/rust-nightly/files/patch-compiler_rustc__target_src_callconv_powerpc64.rs index 2524e1872984..9a31c92a74a7 100644 --- a/lang/rust-nightly/files/patch-compiler_rustc__target_src_abi_call_powerpc64.rs +++ b/lang/rust-nightly/files/patch-compiler_rustc__target_src_callconv_powerpc64.rs @@ -1,11 +1,11 @@ ---- compiler/rustc_target/src/abi/call/powerpc64.rs.orig 2020-03-09 22:11:17 UTC -+++ compiler/rustc_target/src/abi/call/powerpc64.rs -@@ -123,7 +123,7 @@ where +--- compiler/rustc_target/src/callconv/powerpc64.rs.orig 2020-03-09 22:11:17 UTC ++++ compiler/rustc_target/src/callconv/powerpc64.rs +@@ -95,7 +95,7 @@ where ELFv2 } else { match cx.data_layout().endian { - Endian::Big => ELFv1, + Endian::Big => ELFv2, Endian::Little => ELFv2, } }; diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index efecd8bd3a76..19dc3afb51b1 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -1,53 +1,49 @@ When the compiler has "clang" in its name the cc crate will pass an LLVM target triple to it. Rust uses a triple that lacks the OS version and LLVM will default to FreeBSD 9 behavior, i.e., it will default to libstdc++ which is no longer available in newer releases. To avoid this issue assume we have a GNU compatible toolchain instead until LLVM can be updated to use libc++ by default. https://reviews.llvm.org/D77776 -cc-1.1.10/ cc-1.1.22/ - ---- vendor/cc-1.0.105/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.0.105/src/tool.rs +--- vendor/cc-1.0.99/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.0.99/src/tool.rs @@ -151,9 +151,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.1.10/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.1.10/src/tool.rs -@@ -151,9 +151,7 @@ impl Tool { +--- vendor/cc-1.1.22/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.1.22/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"); - ---- vendor/cc-1.1.22/src/tool.rs.orig 2024-10-02 09:43:22.970422000 +0200 -+++ vendor/cc-1.1.22/src/tool.rs 2024-10-02 09:50:42.836352000 +0200 ++ (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.1.23/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.1.23/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");