diff options
Diffstat (limited to 'lang/rust')
| -rw-r--r-- | lang/rust/Makefile | 12 | ||||
| -rw-r--r-- | lang/rust/distinfo | 102 | ||||
| -rw-r--r-- | lang/rust/files/patch-vendor_cc.rs | 100 | ||||
| -rw-r--r-- | lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c | 18 |
4 files changed, 136 insertions, 96 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index b3f9e7bcf803..f4f9f1222023 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ PORTNAME= rust -PORTVERSION?= 1.87.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-04-03 -RUST_BOOTSTRAP_VERSION?= 1.86.0 +BOOTSTRAPS_DATE?= 2025-06-26 +RUST_BOOTSTRAP_VERSION?= 1.88.0 CARGO_VENDOR_DIR?= ${WRKSRC}/vendor @@ -137,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":{},' \ diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 7749cc6eb420..e4f7c8b1d055 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,51 +1,51 @@ -TIMESTAMP = 1747381478 -SHA256 (rust/rustc-1.87.0-src.tar.xz) = 8623b8651893e8c6aebfa45b6a90645a4f652f7b18189a0992a90d11ac2631f4 -SIZE (rust/rustc-1.87.0-src.tar.xz) = 283604208 -SHA256 (rust/2025-04-03/rustc-1.86.0-aarch64-unknown-freebsd.tar.xz) = b49f08bb6781c65121ac56bb4fb75fe309d8614cb54816b53ad2350f3c5341ee -SIZE (rust/2025-04-03/rustc-1.86.0-aarch64-unknown-freebsd.tar.xz) = 64694524 -SHA256 (rust/2025-04-03/rust-std-1.86.0-aarch64-unknown-freebsd.tar.xz) = 0cbe464bef3c655ee225a6e1c012cb77680c1497d1ff934a7f237606695ef7b6 -SIZE (rust/2025-04-03/rust-std-1.86.0-aarch64-unknown-freebsd.tar.xz) = 25076948 -SHA256 (rust/2025-04-03/cargo-1.86.0-aarch64-unknown-freebsd.tar.xz) = 77c7bc54bb4deeebd57dd7847c3f38b151e79e3ebc21a7f8d68f7ac296a96650 -SIZE (rust/2025-04-03/cargo-1.86.0-aarch64-unknown-freebsd.tar.xz) = 8353556 -SHA256 (rust/2025-04-03/rustc-1.86.0-x86_64-unknown-freebsd.tar.xz) = 762b6de1097c22fa28e59a44c0407c3c065428acffed479c12e4b63ba3e5e20d -SIZE (rust/2025-04-03/rustc-1.86.0-x86_64-unknown-freebsd.tar.xz) = 59859608 -SHA256 (rust/2025-04-03/rust-std-1.86.0-x86_64-unknown-freebsd.tar.xz) = 06a8b89e1701bc71a1ff3735441cb2be9c77156b980321172f2f1f8b00e7e1c2 -SIZE (rust/2025-04-03/rust-std-1.86.0-x86_64-unknown-freebsd.tar.xz) = 26323648 -SHA256 (rust/2025-04-03/cargo-1.86.0-x86_64-unknown-freebsd.tar.xz) = d8c2bf87027441a950052d8a224ed030cd6134746597e7b868fc115e28188036 -SIZE (rust/2025-04-03/cargo-1.86.0-x86_64-unknown-freebsd.tar.xz) = 9412224 -SHA256 (rust/2025-04-03/rustc-1.86.0-armv7-unknown-freebsd.tar.xz) = 9482c19107d89e4a2ed9f0c14a70a64e277427eab8b411cb8693c5efeb879eaa -SIZE (rust/2025-04-03/rustc-1.86.0-armv7-unknown-freebsd.tar.xz) = 64784700 -SHA256 (rust/2025-04-03/rust-std-1.86.0-armv7-unknown-freebsd.tar.xz) = aa615f218e1b55cceea6c53c7a6b63e85fdee07d0854aebeab19d53a2f43b4b8 -SIZE (rust/2025-04-03/rust-std-1.86.0-armv7-unknown-freebsd.tar.xz) = 24279348 -SHA256 (rust/2025-04-03/cargo-1.86.0-armv7-unknown-freebsd.tar.xz) = 1d45b5eee9133468f8316c25a7115ebeb95044406554c9c705337697cfe66bfd -SIZE (rust/2025-04-03/cargo-1.86.0-armv7-unknown-freebsd.tar.xz) = 8436308 -SHA256 (rust/2025-04-03/rustc-1.86.0-i686-unknown-freebsd.tar.xz) = 724095086e992ec5266b1c3360053c09943969cd34741418bd71b348002f1421 -SIZE (rust/2025-04-03/rustc-1.86.0-i686-unknown-freebsd.tar.xz) = 72252364 -SHA256 (rust/2025-04-03/rust-std-1.86.0-i686-unknown-freebsd.tar.xz) = 3f9586f04740463e81a205d4933865d956c307020881578a45f51b41128600a4 -SIZE (rust/2025-04-03/rust-std-1.86.0-i686-unknown-freebsd.tar.xz) = 26001160 -SHA256 (rust/2025-04-03/cargo-1.86.0-i686-unknown-freebsd.tar.xz) = a95e66aa8a81ab2eaf0292b48009214e3ee086e3af5473716faa9b4a103485ee -SIZE (rust/2025-04-03/cargo-1.86.0-i686-unknown-freebsd.tar.xz) = 10026684 -SHA256 (rust/2025-04-03/rustc-1.86.0-powerpc-unknown-freebsd.tar.xz) = 30ab4a0223263f91a35889c3c963ae1ceb6ae89093c9794579920503cf5e6576 -SIZE (rust/2025-04-03/rustc-1.86.0-powerpc-unknown-freebsd.tar.xz) = 65902536 -SHA256 (rust/2025-04-03/rust-std-1.86.0-powerpc-unknown-freebsd.tar.xz) = 9b435f6356409712e3c3cefb377e096136603f7a12b860d508211f8d1ca423ed -SIZE (rust/2025-04-03/rust-std-1.86.0-powerpc-unknown-freebsd.tar.xz) = 23515212 -SHA256 (rust/2025-04-03/cargo-1.86.0-powerpc-unknown-freebsd.tar.xz) = 313d4abae5a5f19a300d9f78c045c9e2d32104af99885e1205a859f1f8c93b8a -SIZE (rust/2025-04-03/cargo-1.86.0-powerpc-unknown-freebsd.tar.xz) = 8682124 -SHA256 (rust/2025-04-03/rustc-1.86.0-powerpc64-unknown-freebsd.tar.xz) = 0524fa2437ace6ed7305dd619c7fb7263cca8fab647307e3e6400d675c50b6ee -SIZE (rust/2025-04-03/rustc-1.86.0-powerpc64-unknown-freebsd.tar.xz) = 63944028 -SHA256 (rust/2025-04-03/rust-std-1.86.0-powerpc64-unknown-freebsd.tar.xz) = d0a26c184f8f3dcbcc1e3ce1939057d33dff62a41fc24dbfbd8d5a25dfce73ab -SIZE (rust/2025-04-03/rust-std-1.86.0-powerpc64-unknown-freebsd.tar.xz) = 23494356 -SHA256 (rust/2025-04-03/cargo-1.86.0-powerpc64-unknown-freebsd.tar.xz) = 38f3c952ff10f303f76b7bc3c1bc7ccc00069f9c7b4e850ede8cbf5c54102d37 -SIZE (rust/2025-04-03/cargo-1.86.0-powerpc64-unknown-freebsd.tar.xz) = 8376044 -SHA256 (rust/2025-04-03/rustc-1.86.0-powerpc64le-unknown-freebsd.tar.xz) = 2c89c2605bcf3e8ef1c3e7afbd10223eacd66b9c5d1c863d31eb4f7e57e4b9a9 -SIZE (rust/2025-04-03/rustc-1.86.0-powerpc64le-unknown-freebsd.tar.xz) = 66937772 -SHA256 (rust/2025-04-03/rust-std-1.86.0-powerpc64le-unknown-freebsd.tar.xz) = 263d0632010814ffe8d6a421465d65066941e5b965eb7504377e83d9ba43e0e3 -SIZE (rust/2025-04-03/rust-std-1.86.0-powerpc64le-unknown-freebsd.tar.xz) = 23608152 -SHA256 (rust/2025-04-03/cargo-1.86.0-powerpc64le-unknown-freebsd.tar.xz) = d9b86c14cd5637287d66029f6c8cf12978deabcc4c09b81e67f08a6fd0e4e6bd -SIZE (rust/2025-04-03/cargo-1.86.0-powerpc64le-unknown-freebsd.tar.xz) = 8789924 -SHA256 (rust/2025-04-03/rustc-1.86.0-riscv64gc-unknown-freebsd.tar.xz) = 9a6881d37845c70079d7eab2a4d06782e1edb754d8c8a61596cff83a50f354fd -SIZE (rust/2025-04-03/rustc-1.86.0-riscv64gc-unknown-freebsd.tar.xz) = 71372776 -SHA256 (rust/2025-04-03/rust-std-1.86.0-riscv64gc-unknown-freebsd.tar.xz) = ff9b3d3e21ea8919029aead4c1ef50aaefb3e6f6fdd21f29c66f686bd2b9bcf4 -SIZE (rust/2025-04-03/rust-std-1.86.0-riscv64gc-unknown-freebsd.tar.xz) = 23451920 -SHA256 (rust/2025-04-03/cargo-1.86.0-riscv64gc-unknown-freebsd.tar.xz) = d77f8b50bdb875eaa6410ceb0c61df2512ff97fed47e4af5b28a5f266e0bec35 -SIZE (rust/2025-04-03/cargo-1.86.0-riscv64gc-unknown-freebsd.tar.xz) = 10660864 +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 4bc3a7b24e42..4a763326e4f6 100644 --- a/lang/rust/files/patch-vendor_cc.rs +++ b/lang/rust/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-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.22/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.1.22/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,7 +21,7 @@ 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.orig 2024-12-10 13:16:09 UTC +++ vendor/cc-1.2.0/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { @@ -47,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.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.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 }), @@ -60,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.16/src/tool.rs.orig 2024-05-09 18:20:47 UTC +--- vendor/cc-1.2.16/src/tool.rs.orig 2025-04-01 18:22:03 UTC +++ vendor/cc-1.2.16/src/tool.rs -@@ -174,9 +174,7 @@ impl Tool { +@@ -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 }), @@ -73,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.17/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.17/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 index 95c749f9d63b..03afdc6902f8 100644 --- a/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c +++ b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c @@ -1,27 +1,15 @@ /usr/ports/security/openssl34/files/patch-crypto_threads__pthread.c -+ fix dup IMPL_fallback_atomic_exchange_n (this code was removed in -https://github.com/openssl/openssl/commit/65787e2dc219685c30539c6f60eb6b64b890bf6f) ---- vendor/openssl-src-300.4.2+3.4.1/openssl/crypto/threads_pthread.c.orig 2025-05-09 22:37:37.000000000 +0200 -+++ vendor/openssl-src-300.4.2+3.4.1/openssl/crypto/threads_pthread.c 2025-05-21 14:44:18.563852000 +0200 +--- 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__) ++#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) -@@ -210,8 +214,7 @@ IMPL_fallback_atomic_exchange_n(prcu_cb_item) - pthread_mutex_unlock(&atomic_sim_lock); \ - return ret; \ - } -- --IMPL_fallback_atomic_exchange_n(uint64_t) -+IMPL_fallback_atomic_compare_exchange_n(uint64_t) - - # define ATOMIC_COMPARE_EXCHANGE_N(t, p, e, d, s, f) fallback_atomic_compare_exchange_n_##t(p, e, d, s, f) - |