lang/rust: lang/rust: Update to 1.84.0

Announce: https://blog.rust-lang.org/2025/01/09/Rust-1.84.0.html ChangeLog: https://github.com/rust-lang/rust/releases/tag/1.84.0 PR: 283962 Tested by: mikael,pkubaj
2025-01-09 18:54:40 +01:00 · 2025-01-09 18:54:40 +01:00 · 5c45325650
commit 5c45325650
parent 170277bf7d
10 changed files with 82 additions and 88 deletions
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}

 CARGO_BUILDDEP?=	yes
 .  if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.84.0:lang/${RUST_DEFAULT}
 .  elif ${CARGO_BUILDDEP:tl} == "any-version"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
 .  endif
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@ -77,7 +77,7 @@ ELF_FEATURES+=	+wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
 BUNDLE_LIBS=	yes

 BUILD_DEPENDS+=	rust-cbindgen>=0.26.0:devel/rust-cbindgen \
-				${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT} \
+				${RUST_DEFAULT}>=1.84.0:lang/${RUST_DEFAULT} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@ -2,7 +2,7 @@
 # to upload them to ~/public_distfiles on freefall in preparation
 # for the next lang/rust update.
 PORTNAME=	rust
-PORTVERSION=	1.83.0
+PORTVERSION=	1.84.0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 PKGNAMEPREFIX=	${FLAVOR:S/_/-/g}-
@ -79,6 +79,8 @@ do-configure:
 # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
 	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
 		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
+	@${ECHO_CMD} '# https://github.com/rust-lang/rust/issues/135358 (bug #947897)' >> ${WRKSRC}/config.toml
+	@${ECHO_CMD} 'profile = "dist"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml
--- a/lang/rust-bootstrap/distinfo
+++ b/lang/rust-bootstrap/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1732649274
-SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
-SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388
+TIMESTAMP = 1736442015
+SHA256 (rust/rustc-1.84.0-src.tar.xz) = bc2c1639f26814c7b17a323992f1e08c3b01fe88cdff9a27d951987d886e00b3
+SIZE (rust/rustc-1.84.0-src.tar.xz) = 354993944
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	rust
-PORTVERSION?=	1.83.0
+PORTVERSION?=	1.84.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
@ -72,8 +72,8 @@ WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
 			_RUST_TARGETS+=wasm32-unknown-unknown

 # See WRKSRC/src/stage0 for the date and version values
-BOOTSTRAPS_DATE?=		2024-10-17
-RUST_BOOTSTRAP_VERSION?=	1.82.0
+BOOTSTRAPS_DATE?=		2024-11-28
+RUST_BOOTSTRAP_VERSION?=	1.83.0

 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor

@ -188,6 +188,7 @@ do-configure:
 	@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml
+	@${ECHO_CMD} 'download-rustc=false' >> ${WRKSRC}/config.toml
 .if ${PORT_OPTIONS:MWASM} && !${PORT_OPTIONS:MPORT_LLVM}
 	@${ECHO_CMD} 'lld=true' >> ${WRKSRC}/config.toml
 .else
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@ -1,51 +1,51 @@
-TIMESTAMP = 1732649272
-SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
-SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388
-SHA256 (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2a758f72d6bbb983193dea7d24e6e5fc3811b63f472c6c58f32197af940aa795
-SIZE (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 62711948
-SHA256 (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2ec9beef0b6e222f10c69e40229b00785e484726f15f190872bba92ad05b9356
-SIZE (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 26423576
-SHA256 (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 1493b5ff965b59876dba00a192daf89f74f4ee6686cd89ea878ac86e89a8dded
-SIZE (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 9217928
-SHA256 (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 9bc7885aa7434d9e9fe5e400bd14aba6b7bad47a957fbd12651c2038e8fd64f5
-SIZE (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 51037096
-SHA256 (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 3927d64465cb5bedce595e3ebe728df2cafc719c5ffd68354180f0024b331a6f
-SIZE (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 28148888
-SHA256 (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = d6e96db4a4e78d58cfc9410cc3107e528c839fa2937f18aae8f217e5097a1c15
-SIZE (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = 10406292
-SHA256 (rust/2024-10-17/rustc-1.82.0-armv7-unknown-freebsd.tar.xz) = c13982b87ae60cbe4fe6ddfa96cded7293c0d59011816e6f89cdfa4531964eea
-SIZE (rust/2024-10-17/rustc-1.82.0-armv7-unknown-freebsd.tar.xz) = 62941904
-SHA256 (rust/2024-10-17/rust-std-1.82.0-armv7-unknown-freebsd.tar.xz) = cadc589d89ca68fb81ad2913e60e89348a75bd228725f82faba2d4c961a2aca7
-SIZE (rust/2024-10-17/rust-std-1.82.0-armv7-unknown-freebsd.tar.xz) = 25949604
-SHA256 (rust/2024-10-17/cargo-1.82.0-armv7-unknown-freebsd.tar.xz) = efbd26868fef7fbca7da59591fdbacefa0f3ad5e263b9487d4fe07c93e0da588
-SIZE (rust/2024-10-17/cargo-1.82.0-armv7-unknown-freebsd.tar.xz) = 9313164
-SHA256 (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 0016215d5b3c034cbd8f332336d284690be30f7c088e926fdd2281182f165313
-SIZE (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 71103120
-SHA256 (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = bdf02f49d85c3e7a103bb43bf2982341d765b2afeff2994f5086f2963cbe0bcc
-SIZE (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = 27840180
-SHA256 (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = e5b10d5a18b8f2512fd4aa53a7c30b6b9b61f2572cf59a401d075d3ba588f426
-SIZE (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = 10843032
-SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = b4f5b4599a4e9bbc3f90445bd0aae1aecf0d147947ea512e0f00dfa76a9e3cf2
-SIZE (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = 67416020
-SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 7e7c8623ca7c3105d82478d4ae766ddf489a7e8fbaa01d40f32500d4de06a65d
-SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 25162056
-SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = b6a66517fcf3a08ced4fd887dfa5318ccfa23e897c63666f16149755ec05ba63
-SIZE (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = 9984192
-SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = e050efa9b992d891bf4669c5ecf3531eba6c9a630ed0cbd4c94e00c8cc66317e
-SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 65447208
-SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9790d33816e253ba2a640c47fbf52b61f0c6841c04fe004561ac0fa82b74de90
-SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 25120776
-SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = b8bcfb00232aa49b380c2a6b2b4ad00ef0603d7e545b115046add963e20e3aa9
-SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9636840
-SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 04d7fd15fe90fa5272802e5a3afe6baf4868a0018ecb6e1ecca8c2b009df5cd6
-SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 67188864
-SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = bb76f789c552ffdaab681fa90084e658c0027bbc99f5e8d07c3c0b99efe2181b
-SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 25235320
-SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 1e5f30101156510ac03833bf3362d41fc1b4603f6509dea3c71a8cc0fbb7d76b
-SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 9908700
-SHA256 (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = cb73b8677f807afee63481aaeb51136b5a7db4e9d194a646ba3c9e0c8c4d54cc
-SIZE (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 71586632
-SHA256 (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = ff00c41174c771450ab4b962f7f41f2be18944d3c834fab4316181bec955d784
-SIZE (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 25011372
-SHA256 (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 2f99b7d5f40d1f0f28f474b5e28298652a5e71d9a1bfcfa30ba1283b790f4d7d
-SIZE (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 11545916
+TIMESTAMP = 1736442014
+SHA256 (rust/rustc-1.84.0-src.tar.xz) = bc2c1639f26814c7b17a323992f1e08c3b01fe88cdff9a27d951987d886e00b3
+SIZE (rust/rustc-1.84.0-src.tar.xz) = 354993944
+SHA256 (rust/2024-11-28/rustc-1.83.0-aarch64-unknown-freebsd.tar.xz) = 53625317b287426cc6c0b1a15c3480625e3ed5f3199229def81bcb8dfd511e73
+SIZE (rust/2024-11-28/rustc-1.83.0-aarch64-unknown-freebsd.tar.xz) = 59883804
+SHA256 (rust/2024-11-28/rust-std-1.83.0-aarch64-unknown-freebsd.tar.xz) = 5762a84851b4942eca8067759c62860e741b6d07bef5f1524bc9993f2c62f3e3
+SIZE (rust/2024-11-28/rust-std-1.83.0-aarch64-unknown-freebsd.tar.xz) = 26594288
+SHA256 (rust/2024-11-28/cargo-1.83.0-aarch64-unknown-freebsd.tar.xz) = 903cc3f68ac256491b9ca9057da93dee2ce7c687cd05c419ce5a3ec7d9151533
+SIZE (rust/2024-11-28/cargo-1.83.0-aarch64-unknown-freebsd.tar.xz) = 9379764
+SHA256 (rust/2024-11-28/rustc-1.83.0-x86_64-unknown-freebsd.tar.xz) = bcd20ce537bdfa0fa190200562fb3bf4314e8eebb896b6f2dd6f57bd8d50c391
+SIZE (rust/2024-11-28/rustc-1.83.0-x86_64-unknown-freebsd.tar.xz) = 49342052
+SHA256 (rust/2024-11-28/rust-std-1.83.0-x86_64-unknown-freebsd.tar.xz) = cd8ae7414b81ed3f7a90a10d2f5d1266bf6d19c70f88cdbc2b5cb96b3560954d
+SIZE (rust/2024-11-28/rust-std-1.83.0-x86_64-unknown-freebsd.tar.xz) = 28442576
+SHA256 (rust/2024-11-28/cargo-1.83.0-x86_64-unknown-freebsd.tar.xz) = 393e95a10de60ff8979b69a3228470e630980e49f189ef19fa7d15038afd81a9
+SIZE (rust/2024-11-28/cargo-1.83.0-x86_64-unknown-freebsd.tar.xz) = 10586716
+SHA256 (rust/2024-11-28/rustc-1.83.0-armv7-unknown-freebsd.tar.xz) = d05b0d45cc822284733accc251a03ddf6739f8d678819f0ced23fb0d925bdfd2
+SIZE (rust/2024-11-28/rustc-1.83.0-armv7-unknown-freebsd.tar.xz) = 60567988
+SHA256 (rust/2024-11-28/rust-std-1.83.0-armv7-unknown-freebsd.tar.xz) = ffc92e23bf8b132a50a994a7cd46664148cc1632ac646c301376bbe2cc56ac4c
+SIZE (rust/2024-11-28/rust-std-1.83.0-armv7-unknown-freebsd.tar.xz) = 26241532
+SHA256 (rust/2024-11-28/cargo-1.83.0-armv7-unknown-freebsd.tar.xz) = c42dc139fb9a3b3bd32c655ad6b30352b8eb25ee3ee9a8ba462cb512c6187903
+SIZE (rust/2024-11-28/cargo-1.83.0-armv7-unknown-freebsd.tar.xz) = 9553468
+SHA256 (rust/2024-11-28/rustc-1.83.0-i686-unknown-freebsd.tar.xz) = c90a73dfa93ff5567402f8bab30bc14e37a630284f63332feee6edfac6cecf1a
+SIZE (rust/2024-11-28/rustc-1.83.0-i686-unknown-freebsd.tar.xz) = 68616492
+SHA256 (rust/2024-11-28/rust-std-1.83.0-i686-unknown-freebsd.tar.xz) = 46fa7ef2ceae4bfc3274898eaf24877551ae225b276a87e832a8999b816a8dc7
+SIZE (rust/2024-11-28/rust-std-1.83.0-i686-unknown-freebsd.tar.xz) = 28074600
+SHA256 (rust/2024-11-28/cargo-1.83.0-i686-unknown-freebsd.tar.xz) = 9f3bde750b6c3787dd520dd246fb3c50e1496242f998598aefd138186675f7e4
+SIZE (rust/2024-11-28/cargo-1.83.0-i686-unknown-freebsd.tar.xz) = 11228084
+SHA256 (rust/2024-11-28/rustc-1.83.0-powerpc-unknown-freebsd.tar.xz) = 2aaa361f7fee6d9755de47364eb53fec3486f7d9a5e916b50c003b38d7c37fc4
+SIZE (rust/2024-11-28/rustc-1.83.0-powerpc-unknown-freebsd.tar.xz) = 64724884
+SHA256 (rust/2024-11-28/rust-std-1.83.0-powerpc-unknown-freebsd.tar.xz) = 98112a1b24282a395cdf7d0e09f10a3c51464500af223c8b07c0ff53fe92f537
+SIZE (rust/2024-11-28/rust-std-1.83.0-powerpc-unknown-freebsd.tar.xz) = 25370768
+SHA256 (rust/2024-11-28/cargo-1.83.0-powerpc-unknown-freebsd.tar.xz) = 686d679977593a829e4280a0cb46de1212e2c62a6ad6a5c11486b8558d99a8dc
+SIZE (rust/2024-11-28/cargo-1.83.0-powerpc-unknown-freebsd.tar.xz) = 10115760
+SHA256 (rust/2024-11-28/rustc-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 1cb1579ccbffe166555d435450563d3ee48d1f5efc87592a568b7795f1e67748
+SIZE (rust/2024-11-28/rustc-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 62769248
+SHA256 (rust/2024-11-28/rust-std-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 7d54fc02cf6f040a99b8e0d63bfc7be65818dca4cea1c674a0ebef8108808651
+SIZE (rust/2024-11-28/rust-std-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 25375440
+SHA256 (rust/2024-11-28/cargo-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 5ca797e83b71165ac679b06a7337a0bfba2ad8265c151d19c3754e155152df07
+SIZE (rust/2024-11-28/cargo-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 9793476
+SHA256 (rust/2024-11-28/rustc-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = fa8cb467a256c6f2c73663185a65c539904b297933f821b5184d08a9385cab58
+SIZE (rust/2024-11-28/rustc-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 64271412
+SHA256 (rust/2024-11-28/rust-std-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 576c54a125e2b16e7374f39a66d5cdfd8fcf5d77b6c8f95def10cbdd8c46f5c6
+SIZE (rust/2024-11-28/rust-std-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 25495056
+SHA256 (rust/2024-11-28/cargo-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 9ebff9fb381075bbc2e121c99ac1e6c6b52df168d9b2bc7124ee7055e202e7b0
+SIZE (rust/2024-11-28/cargo-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 10021204
+SHA256 (rust/2024-11-28/rustc-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 3cce6f097a064a11e97f20953c8a25f31712132b94205145c30a4b6f5b7a86fc
+SIZE (rust/2024-11-28/rustc-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 69320848
+SHA256 (rust/2024-11-28/rust-std-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = d842e0d6677371954789991bc42875bc4ad02df80f362a2f643e62d521adb304
+SIZE (rust/2024-11-28/rust-std-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 25295428
+SHA256 (rust/2024-11-28/cargo-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 350afd6ce31fa76dda1693ae7de23106227cac4344c283a83725e5f3e5c3dd32
+SIZE (rust/2024-11-28/cargo-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 11818580
--- a/lang/rust/files/patch-compiler_rustc__target_src_callconv_powerpc64.rs
+++ b/lang/rust/files/patch-compiler_rustc__target_src_callconv_powerpc64.rs
@ -1,5 +1,5 @@
--- compiler/rustc_target/src/abi/call/powerpc64.rs.orig	2020-03-09 22:11:17 UTC
-+++ compiler/rustc_target/src/abi/call/powerpc64.rs
+--- 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 {
--- a/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv6unknownfreebsd.rs
+++ b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv6unknownfreebsd.rs
@ -1,10 +0,0 @@
--- compiler/rustc_target/src/spec/targets/armv6_unknown_freebsd.rs.orig	2024-10-31 18:07:58.495590000 +0100
-+++ compiler/rustc_target/src/spec/targets/armv6_unknown_freebsd.rs	2024-10-31 18:08:05.438220000 +0100
-@@ -14,7 +14,6 @@ pub fn target() -> Target {
-         arch: "arm".into(),
-         options: TargetOptions {
-             abi: "eabihf".into(),
-            env: "gnu".into(),
-             features: "+v6,+vfp2,-d32".into(),
-             max_atomic_width: Some(64),
-             mcount: "\u{1}__gnu_mcount_nc".into(),
--- a/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv7unknownfreebsd.rs
+++ b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv7unknownfreebsd.rs
@ -1,10 +0,0 @@
--- compiler/rustc_target/src/spec/targets/armv7_unknown_freebsd.rs.orig	2024-10-31 18:07:51.199947000 +0100
-+++ compiler/rustc_target/src/spec/targets/armv7_unknown_freebsd.rs	2024-10-31 18:08:14.463398000 +0100
-@@ -14,7 +14,6 @@ pub fn target() -> Target {
-         arch: "arm".into(),
-         options: TargetOptions {
-             abi: "eabihf".into(),
-            env: "gnu".into(),
-             features: "+v7,+vfp3,-d32,+thumb2,-neon".into(),
-             max_atomic_width: Some(64),
-             mcount: "\u{1}__gnu_mcount_nc".into(),
--- a/lang/rust/files/patch-vendor_cc.rs
+++ b/lang/rust/files/patch-vendor_cc.rs
@ -21,9 +21,8 @@ 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-11-27 08:36:40.862061000 +0100
-+++ vendor/cc-1.1.22/src/tool.rs	2024-11-27 08:38:23.622042000 +0100
+--- 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, emscripten, vxworks) {
@ -35,9 +34,21 @@ 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.1.23/src/tool.rs.orig	2024-11-27 08:36:40.862061000 +0100
-+++ vendor/cc-1.1.23/src/tool.rs	2024-11-27 08:38:23.622042000 +0100
+--- vendor/cc-1.1.34/src/tool.rs.orig	2024-05-09 18:20:47 UTC
+++ vendor/cc-1.1.34/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.5/src/tool.rs.orig	2024-05-09 18:20:47 UTC
+++ vendor/cc-1.2.5/src/tool.rs
@@ -174,9 +174,7 @@ impl Tool {
 
             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {