summaryrefslogtreecommitdiff
path: root/lang/rust
diff options
context:
space:
mode:
Diffstat (limited to 'lang/rust')
-rw-r--r--lang/rust/Makefile20
-rw-r--r--lang/rust/distinfo102
-rw-r--r--lang/rust/files/patch-vendor_cc.rs107
-rw-r--r--lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c15
-rw-r--r--lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs10
5 files changed, 159 insertions, 95 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 5e77bdf85bb6..f4f9f1222023 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rust
-PORTVERSION?= 1.86.0
+PORTVERSION?= 1.89.0
PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/:src \
@@ -38,7 +38,7 @@ MAKE_ENV= DESTDIR=${STAGEDIR} \
TEST_ENV= ${MAKE_ENV} \
ALLOW_NONZERO_RLIMIT_CORE=1
-CONFLICTS_INSTALL?= rust-nightly
+CONFLICTS_INSTALL?= rust-nightly rust188
# rustc stashes intermediary files in TMPDIR (default /tmp) which
# might cause issues for users that for some reason space limit
@@ -63,7 +63,7 @@ DOCS_VARS= _RUST_BUILD_DOCS=true \
_COMPONENTS+="rust-docs-${_PACKAGE_VERS}-${_RUST_TARGET} rust-docs-json-${_PACKAGE_VERS}-${_RUST_TARGET}"
DOCS_VARS_OFF= _RUST_BUILD_DOCS=false
GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb
-PORT_LLVM_USES= llvm:min=18,lib,noexport
+PORT_LLVM_USES= llvm:min=19,lib,noexport
PORT_LLVM_MAKE_ENV= RUSTFLAGS="-Lnative=${LOCALBASE}/lib"
SOURCES_VARS= _COMPONENTS+=rust-src-${_PACKAGE_VERS} \
_RUST_TOOLS+=src
@@ -71,8 +71,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?= 2025-02-20
-RUST_BOOTSTRAP_VERSION?= 1.85.0
+BOOTSTRAPS_DATE?= 2025-06-26
+RUST_BOOTSTRAP_VERSION?= 1.88.0
CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
@@ -107,12 +107,6 @@ LIB_DEPENDS+= libatomic.so:lang/gcc${GCC_DEFAULT}
MAKE_ENV+= RUSTFLAGS="-L/usr/local/lib/gcc${GCC_DEFAULT}"
.endif
-# rls doesn't build on rust nightly
-.if !defined(NIGHTLY_DATE)
-_RUST_TOOLS+= rls
-_COMPONENTS+= rls-${_PACKAGE_VERS}-${_RUST_TARGET}
-.endif
-
.if ${ARCH} != powerpc64le
MAKE_ENV+= RUST_BACKTRACE=1
.endif
@@ -143,7 +137,7 @@ DISTFILES:= ${DISTFILES:M*\:src} \
post-patch:
@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
.if defined(NIGHTLY_DATE)
- @${REINPLACE_CMD} 's/rustfmt/nothx/' ${WRKSRC}/src/stage0
+ @${REINPLACE_CMD} '/rustfmt/d' ${WRKSRC}/src/stage0
.endif
# Disable vendor checksums
@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
@@ -198,7 +192,7 @@ do-configure:
.endif
@${ECHO_CMD} 'remap-debuginfo=true' >> ${WRKSRC}/config.toml
@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
- @${ECHO_CMD} 'download-ci-llvm = false' >> ${WRKSRC}/config.toml
+ @${ECHO_CMD} 'download-ci-llvm=false' >> ${WRKSRC}/config.toml
.if ${PORT_OPTIONS:MLTO}
@${ECHO_CMD} 'thin-lto=true' >> ${WRKSRC}/config.toml
.endif
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 3b695e33c515..e4f7c8b1d055 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,51 +1,51 @@
-TIMESTAMP = 1743576322
-SHA256 (rust/rustc-1.86.0-src.tar.xz) = d939eada065dc827a9d4dbb55bd48533ad14c16e7f0a42e70147029c82a7707b
-SIZE (rust/rustc-1.86.0-src.tar.xz) = 275696736
-SHA256 (rust/2025-02-20/rustc-1.85.0-aarch64-unknown-freebsd.tar.xz) = 263a1780af56087082775440e6bc8dcdb8cd5312d9207bd9950cbc8a1487d1b9
-SIZE (rust/2025-02-20/rustc-1.85.0-aarch64-unknown-freebsd.tar.xz) = 63848136
-SHA256 (rust/2025-02-20/rust-std-1.85.0-aarch64-unknown-freebsd.tar.xz) = ece47bb406b8226e4e9c20e74b00104fbe407ff202cf195e19985e4da8212419
-SIZE (rust/2025-02-20/rust-std-1.85.0-aarch64-unknown-freebsd.tar.xz) = 24532584
-SHA256 (rust/2025-02-20/cargo-1.85.0-aarch64-unknown-freebsd.tar.xz) = 24b792341dcdc06d46bcd92261d24996fb7f93b064d3253b1fe635f8755b2fa7
-SIZE (rust/2025-02-20/cargo-1.85.0-aarch64-unknown-freebsd.tar.xz) = 8280968
-SHA256 (rust/2025-02-20/rustc-1.85.0-x86_64-unknown-freebsd.tar.xz) = 72c3438c3ddddd35e721a25ff07be6b6c10fc9187c01c28c6d48c844f4274bb0
-SIZE (rust/2025-02-20/rustc-1.85.0-x86_64-unknown-freebsd.tar.xz) = 59066360
-SHA256 (rust/2025-02-20/rust-std-1.85.0-x86_64-unknown-freebsd.tar.xz) = 2a30cdeb311a553062d9e8328120b0ad526bffcad8faf4c40b0657932b84ecaa
-SIZE (rust/2025-02-20/rust-std-1.85.0-x86_64-unknown-freebsd.tar.xz) = 25964472
-SHA256 (rust/2025-02-20/cargo-1.85.0-x86_64-unknown-freebsd.tar.xz) = 03050e2353a454945487444e81d314184f29386e85a6b26eb167ea5a1c9516d3
-SIZE (rust/2025-02-20/cargo-1.85.0-x86_64-unknown-freebsd.tar.xz) = 9389564
-SHA256 (rust/2025-02-20/rustc-1.85.0-armv7-unknown-freebsd.tar.xz) = 3746b7df6faa1e276a8bc6367d98a2cabbb771a0a36827288006b16f9163006b
-SIZE (rust/2025-02-20/rustc-1.85.0-armv7-unknown-freebsd.tar.xz) = 64538436
-SHA256 (rust/2025-02-20/rust-std-1.85.0-armv7-unknown-freebsd.tar.xz) = 8eead364ced899e2eb1e8ec5a58ff2f920e8a2d2d671352159ee55e82d63edfa
-SIZE (rust/2025-02-20/rust-std-1.85.0-armv7-unknown-freebsd.tar.xz) = 23888692
-SHA256 (rust/2025-02-20/cargo-1.85.0-armv7-unknown-freebsd.tar.xz) = 5e6d95c7fa0c43117e5fcea1326518f2279bab3963f71b56e417a42da7a78248
-SIZE (rust/2025-02-20/cargo-1.85.0-armv7-unknown-freebsd.tar.xz) = 8388400
-SHA256 (rust/2025-02-20/rustc-1.85.0-i686-unknown-freebsd.tar.xz) = a002e334d881dc1021d4915f332eca55f3d0f79af6303abbfbd217ac6b82c472
-SIZE (rust/2025-02-20/rustc-1.85.0-i686-unknown-freebsd.tar.xz) = 71224704
-SHA256 (rust/2025-02-20/rust-std-1.85.0-i686-unknown-freebsd.tar.xz) = 5103f842d1d542a401c171b7d3e2383b7bd2652c915b4559657a31cd4f82c16b
-SIZE (rust/2025-02-20/rust-std-1.85.0-i686-unknown-freebsd.tar.xz) = 25670272
-SHA256 (rust/2025-02-20/cargo-1.85.0-i686-unknown-freebsd.tar.xz) = c14d0fe655d8caafc9163ae1c83133fcc64fc0f677299a69143ce7ed4bd4c67a
-SIZE (rust/2025-02-20/cargo-1.85.0-i686-unknown-freebsd.tar.xz) = 9994044
-SHA256 (rust/2025-02-20/rustc-1.85.0-powerpc-unknown-freebsd.tar.xz) = fab0266506c15b04289d273e9a79b42825b0d1b0189b3aedf5d5e0e7fb39b294
-SIZE (rust/2025-02-20/rustc-1.85.0-powerpc-unknown-freebsd.tar.xz) = 64554876
-SHA256 (rust/2025-02-20/rust-std-1.85.0-powerpc-unknown-freebsd.tar.xz) = 3079b6752dc30266fd844b58ccf69d496f7feca174376e9aba3485b6a473f308
-SIZE (rust/2025-02-20/rust-std-1.85.0-powerpc-unknown-freebsd.tar.xz) = 23201788
-SHA256 (rust/2025-02-20/cargo-1.85.0-powerpc-unknown-freebsd.tar.xz) = 9cb32edb80a6c968ecae6cc9b74dafb95527c3f1dc704db30870894a19970742
-SIZE (rust/2025-02-20/cargo-1.85.0-powerpc-unknown-freebsd.tar.xz) = 8637968
-SHA256 (rust/2025-02-20/rustc-1.85.0-powerpc64-unknown-freebsd.tar.xz) = 3daf87d5fd874d04fb6c6e8d5e7e0ad1a66529fa7f0c95d8c6f143ecab8c9c90
-SIZE (rust/2025-02-20/rustc-1.85.0-powerpc64-unknown-freebsd.tar.xz) = 62803860
-SHA256 (rust/2025-02-20/rust-std-1.85.0-powerpc64-unknown-freebsd.tar.xz) = 2fe0358e9ee93cbc19d7f3976ad9cdf452e0e7ccbe03f915089e75d95fbfa5e3
-SIZE (rust/2025-02-20/rust-std-1.85.0-powerpc64-unknown-freebsd.tar.xz) = 23131736
-SHA256 (rust/2025-02-20/cargo-1.85.0-powerpc64-unknown-freebsd.tar.xz) = 08ae41664e508e9f3bf8799b5606219aeaca72c666867c8b3f233cc3e47df900
-SIZE (rust/2025-02-20/cargo-1.85.0-powerpc64-unknown-freebsd.tar.xz) = 8334552
-SHA256 (rust/2025-02-20/rustc-1.85.0-powerpc64le-unknown-freebsd.tar.xz) = 0e5f81e1916afd5551878986712e42d554d72ce725673582d7a46dd7eca8c84a
-SIZE (rust/2025-02-20/rustc-1.85.0-powerpc64le-unknown-freebsd.tar.xz) = 66549060
-SHA256 (rust/2025-02-20/rust-std-1.85.0-powerpc64le-unknown-freebsd.tar.xz) = 07c458e4f6f9b2eab5005bce65ed0e3aabb7a9194fdcb31f236c69e8268a053e
-SIZE (rust/2025-02-20/rust-std-1.85.0-powerpc64le-unknown-freebsd.tar.xz) = 23201480
-SHA256 (rust/2025-02-20/cargo-1.85.0-powerpc64le-unknown-freebsd.tar.xz) = 209624edb36f33b5f998222a95c01bca170f18e7ca53f344f7ede7e836c8230d
-SIZE (rust/2025-02-20/cargo-1.85.0-powerpc64le-unknown-freebsd.tar.xz) = 8764996
-SHA256 (rust/2025-02-20/rustc-1.85.0-riscv64gc-unknown-freebsd.tar.xz) = 0c96e1362b4e1ae93e58619f50debd99e9c565bb72188491c5cd5b44fd4a91a6
-SIZE (rust/2025-02-20/rustc-1.85.0-riscv64gc-unknown-freebsd.tar.xz) = 71456032
-SHA256 (rust/2025-02-20/rust-std-1.85.0-riscv64gc-unknown-freebsd.tar.xz) = 89bd9ccef03fa575df82cf514fafcd1fae4c05335a2615bb36e4c0d480c2f3e3
-SIZE (rust/2025-02-20/rust-std-1.85.0-riscv64gc-unknown-freebsd.tar.xz) = 23160876
-SHA256 (rust/2025-02-20/cargo-1.85.0-riscv64gc-unknown-freebsd.tar.xz) = 6a94d02e8c970adb7f7d2006e42d1f5f36270723129b6b818c980fd1a0876a2a
-SIZE (rust/2025-02-20/cargo-1.85.0-riscv64gc-unknown-freebsd.tar.xz) = 10529400
+TIMESTAMP = 1755503845
+SHA256 (rust/rustc-1.89.0-src.tar.xz) = 0b9d55610d8270e06c44f459d1e2b7918a5e673809c592abed9b9c600e33d95a
+SIZE (rust/rustc-1.89.0-src.tar.xz) = 267487572
+SHA256 (rust/2025-06-26/rustc-1.88.0-aarch64-unknown-freebsd.tar.xz) = 67172d0cdc6d52a02f483c46c12e4ba33312974c62db46b43ecd3b1f3b43d132
+SIZE (rust/2025-06-26/rustc-1.88.0-aarch64-unknown-freebsd.tar.xz) = 67731064
+SHA256 (rust/2025-06-26/rust-std-1.88.0-aarch64-unknown-freebsd.tar.xz) = 1575d764a1490626776b4ab2001a4aa16a3e1d89dfdc9f283e42a54e392d1ac6
+SIZE (rust/2025-06-26/rust-std-1.88.0-aarch64-unknown-freebsd.tar.xz) = 25194144
+SHA256 (rust/2025-06-26/cargo-1.88.0-aarch64-unknown-freebsd.tar.xz) = 3babd56a24e9fede664b8f4374eb10455f84336e580dd9bbd43bec30f7edd5bc
+SIZE (rust/2025-06-26/cargo-1.88.0-aarch64-unknown-freebsd.tar.xz) = 8880928
+SHA256 (rust/2025-06-26/rustc-1.88.0-x86_64-unknown-freebsd.tar.xz) = 3ef42208bf53295061c4a058fa480512ea19ecb651266ab6640d5aa453a7083d
+SIZE (rust/2025-06-26/rustc-1.88.0-x86_64-unknown-freebsd.tar.xz) = 63955284
+SHA256 (rust/2025-06-26/rust-std-1.88.0-x86_64-unknown-freebsd.tar.xz) = 8ce82d28c71abfebdcd80cda50fc6ca5e4d275675f7cd9c6948b2695504b7657
+SIZE (rust/2025-06-26/rust-std-1.88.0-x86_64-unknown-freebsd.tar.xz) = 26263140
+SHA256 (rust/2025-06-26/cargo-1.88.0-x86_64-unknown-freebsd.tar.xz) = bc1418734bb07f72941ed013b2362e1728ec1b04bb57310617135ae3c598f559
+SIZE (rust/2025-06-26/cargo-1.88.0-x86_64-unknown-freebsd.tar.xz) = 10114468
+SHA256 (rust/2025-06-26/rustc-1.88.0-armv7-unknown-freebsd.tar.xz) = bd9e99725e5dee3f7f389222e98bacc507fed08d865bc903bb5dfd3662c2dedb
+SIZE (rust/2025-06-26/rustc-1.88.0-armv7-unknown-freebsd.tar.xz) = 68041072
+SHA256 (rust/2025-06-26/rust-std-1.88.0-armv7-unknown-freebsd.tar.xz) = 531e4433569e18481fd786eabf3c321c09e2052eaef3df1c32e962b4cfe29e9c
+SIZE (rust/2025-06-26/rust-std-1.88.0-armv7-unknown-freebsd.tar.xz) = 24377108
+SHA256 (rust/2025-06-26/cargo-1.88.0-armv7-unknown-freebsd.tar.xz) = 78a903b07855caf8c0671516a79f29b1a646f0d1b6147e0cc1930c29ee5dcf13
+SIZE (rust/2025-06-26/cargo-1.88.0-armv7-unknown-freebsd.tar.xz) = 9172844
+SHA256 (rust/2025-06-26/rustc-1.88.0-i686-unknown-freebsd.tar.xz) = 775ad2c77c0a3268ed062503cb5c173a988522e576630aeab7050b7dae2ab225
+SIZE (rust/2025-06-26/rustc-1.88.0-i686-unknown-freebsd.tar.xz) = 76553540
+SHA256 (rust/2025-06-26/rust-std-1.88.0-i686-unknown-freebsd.tar.xz) = af621a50d65c78b84356c0c69cd3b557fc0ed12c653a10c54d23035265bac876
+SIZE (rust/2025-06-26/rust-std-1.88.0-i686-unknown-freebsd.tar.xz) = 25898736
+SHA256 (rust/2025-06-26/cargo-1.88.0-i686-unknown-freebsd.tar.xz) = 21c27c8b3c8d17b0ba5b6dbba3800944d8a88c36e7437f527fc391019c2b2e58
+SIZE (rust/2025-06-26/cargo-1.88.0-i686-unknown-freebsd.tar.xz) = 10724288
+SHA256 (rust/2025-06-26/rustc-1.88.0-powerpc-unknown-freebsd.tar.xz) = e0a65f62a77c1dc566a1207a3f7c1ef6086b5f288c6fd512a6726648d6618bb3
+SIZE (rust/2025-06-26/rustc-1.88.0-powerpc-unknown-freebsd.tar.xz) = 69209400
+SHA256 (rust/2025-06-26/rust-std-1.88.0-powerpc-unknown-freebsd.tar.xz) = a0c153d21656da59a6e9dedc6823e7ea3443a63b20a5c5cafc5cbaca1aed3fea
+SIZE (rust/2025-06-26/rust-std-1.88.0-powerpc-unknown-freebsd.tar.xz) = 23355452
+SHA256 (rust/2025-06-26/cargo-1.88.0-powerpc-unknown-freebsd.tar.xz) = cdd57cca7f144245c836a86a59bdb823792f58c0192af398854de0ee8115c04b
+SIZE (rust/2025-06-26/cargo-1.88.0-powerpc-unknown-freebsd.tar.xz) = 9289100
+SHA256 (rust/2025-06-26/rustc-1.88.0-powerpc64-unknown-freebsd.tar.xz) = 4e5fee68df5d3a4f5bab892f6174af9d8da9394c9964c436578faf428cbd5bbd
+SIZE (rust/2025-06-26/rustc-1.88.0-powerpc64-unknown-freebsd.tar.xz) = 67654832
+SHA256 (rust/2025-06-26/rust-std-1.88.0-powerpc64-unknown-freebsd.tar.xz) = 2c714953eff5dcd21c858d898f6e252e40ab9693a09ffabdcd66fcb36d0e7d37
+SIZE (rust/2025-06-26/rust-std-1.88.0-powerpc64-unknown-freebsd.tar.xz) = 23401704
+SHA256 (rust/2025-06-26/cargo-1.88.0-powerpc64-unknown-freebsd.tar.xz) = 57e9aa16c4ee7fe284e54ec01a84caf08ef3139fd4f22c2f05e13f810dae76af
+SIZE (rust/2025-06-26/cargo-1.88.0-powerpc64-unknown-freebsd.tar.xz) = 9336784
+SHA256 (rust/2025-06-26/rustc-1.88.0-powerpc64le-unknown-freebsd.tar.xz) = 1cb12bc1f6edb054b3656a7439a76c88cf80cdb6eb1695f9de89b1c4aa05bf14
+SIZE (rust/2025-06-26/rustc-1.88.0-powerpc64le-unknown-freebsd.tar.xz) = 70776456
+SHA256 (rust/2025-06-26/rust-std-1.88.0-powerpc64le-unknown-freebsd.tar.xz) = 994fc09c860c757b1c1fcb0c1bf340d03a57f50e2c01f90fec06c81b053bc37f
+SIZE (rust/2025-06-26/rust-std-1.88.0-powerpc64le-unknown-freebsd.tar.xz) = 23532512
+SHA256 (rust/2025-06-26/cargo-1.88.0-powerpc64le-unknown-freebsd.tar.xz) = 0da207963f267df74448c3d5ac88c0b190db9984dc1acc9db8e21cab4e1913b9
+SIZE (rust/2025-06-26/cargo-1.88.0-powerpc64le-unknown-freebsd.tar.xz) = 9845780
+SHA256 (rust/2025-06-26/rustc-1.88.0-riscv64gc-unknown-freebsd.tar.xz) = 06270fe10241b8aa7e50cee4c35372afb2f05f073aa4a7d2b2f9ab2a1a74d1c7
+SIZE (rust/2025-06-26/rustc-1.88.0-riscv64gc-unknown-freebsd.tar.xz) = 77696432
+SHA256 (rust/2025-06-26/rust-std-1.88.0-riscv64gc-unknown-freebsd.tar.xz) = cb2f7535dde028a80630e7af8de74121e5c0fe61239fbd46b91fa0b9ce7dd793
+SIZE (rust/2025-06-26/rust-std-1.88.0-riscv64gc-unknown-freebsd.tar.xz) = 23559976
+SHA256 (rust/2025-06-26/cargo-1.88.0-riscv64gc-unknown-freebsd.tar.xz) = fcc3c82e832d7561e7de38d84f5415fc4d2d246f7b1ee5cf21567fb2ca296d90
+SIZE (rust/2025-06-26/cargo-1.88.0-riscv64gc-unknown-freebsd.tar.xz) = 11619296
diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs
index c711d629e744..4a763326e4f6 100644
--- a/lang/rust/files/patch-vendor_cc.rs
+++ b/lang/rust/files/patch-vendor_cc.rs
@@ -8,21 +8,21 @@ 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-05-09 18:20:47 UTC
-+++ vendor/cc-1.0.99/src/tool.rs
-@@ -151,9 +151,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");
---- vendor/cc-1.1.22/src/tool.rs.orig 2024-05-09 18:20:47 UTC
-+++ vendor/cc-1.1.22/src/tool.rs
++ (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 {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -34,9 +34,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.0/src/tool.rs.orig 2024-05-09 18:20:47 UTC
-+++ vendor/cc-1.2.0/src/tool.rs
-@@ -174,9 +174,7 @@ impl Tool {
+--- 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 }),
@@ -47,9 +47,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.10/src/tool.rs.orig 2024-05-09 18:20:47 UTC
-+++ vendor/cc-1.2.10/src/tool.rs
-@@ -174,9 +174,7 @@ impl Tool {
+--- 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 }),
@@ -60,9 +60,74 @@ 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 2024-05-09 18:20:47 UTC
-+++ vendor/cc-1.2.13/src/tool.rs
-@@ -174,9 +174,7 @@ impl Tool {
+--- 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.25/src/tool.rs.orig 2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.25/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) {
(clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
diff --git a/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c
new file mode 100644
index 000000000000..03afdc6902f8
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c
@@ -0,0 +1,15 @@
+/usr/ports/security/openssl34/files/patch-crypto_threads__pthread.c
+
+--- vendor/openssl-src-300.5.0+3.5.0/openssl/crypto/threads_pthread.c.orig 2025-05-09 22:37:37.000000000 +0200
++++ vendor/openssl-src-300.5.0+3.5.0/openssl/crypto/threads_pthread.c 2025-05-21 14:44:18.563852000 +0200
+@@ -50,6 +50,10 @@ __tsan_mutex_post_lock((x), 0, 0)
+ # define BROKEN_CLANG_ATOMICS
+ #endif
+
++#if defined(__FreeBSD__) && (defined(__i386__) || (defined(__powerpc__) && defined(__ILP32__)))
++#define BROKEN_CLANG_ATOMICS
++#endif
++
+ #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
+
+ # if defined(OPENSSL_SYS_UNIX)
diff --git a/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs b/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs
deleted file mode 100644
index 755907739e36..000000000000
--- a/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
---- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2021-11-04 11:27:54 UTC
-+++ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
-@@ -284,6 +284,7 @@ impl Build {
- "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
- "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
- "riscv64gc-unknown-linux-gnu" => "linux-generic64",
-+ "riscv64gc-unknown-freebsd" => "BSD-generic64",
- "s390x-unknown-linux-gnu" => "linux64-s390x",
- "s390x-unknown-linux-musl" => "linux64-s390x",
- "x86_64-apple-darwin" => "darwin64-x86_64-cc",
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 07:04:02 +0000