diff options
Diffstat (limited to 'lang/rust')
| -rw-r--r-- | lang/rust/Makefile | 18 | ||||
| -rw-r--r-- | lang/rust/distinfo | 102 | ||||
| -rw-r--r-- | lang/rust/files/patch-vendor_cc.rs | 16 | ||||
| -rw-r--r-- | lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c | 27 | ||||
| -rw-r--r-- | lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs | 10 |
5 files changed, 92 insertions, 81 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 5e77bdf85bb6..dfa0dc4ed126 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ PORTNAME= rust -PORTVERSION?= 1.86.0 +PORTVERSION?= 1.88.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -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-05-15 +RUST_BOOTSTRAP_VERSION?= 1.87.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..833397cfa5cc 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 = 1751532290 +SHA256 (rust/rustc-1.88.0-src.tar.xz) = 0c1dcbb4f762513d021e1a282c0ac58c0a423642b3a6bf581cafb5414df4193e +SIZE (rust/rustc-1.88.0-src.tar.xz) = 283294344 +SHA256 (rust/2025-05-15/rustc-1.87.0-aarch64-unknown-freebsd.tar.xz) = 6d7a7fe409d84019a6681a7c5bbe804c2a71444dffa482c277f7303afbbac1bb +SIZE (rust/2025-05-15/rustc-1.87.0-aarch64-unknown-freebsd.tar.xz) = 68494832 +SHA256 (rust/2025-05-15/rust-std-1.87.0-aarch64-unknown-freebsd.tar.xz) = 85fbfeab2bee94cddc8f237324de6ac0b65511b61427611bb600f589cd83269f +SIZE (rust/2025-05-15/rust-std-1.87.0-aarch64-unknown-freebsd.tar.xz) = 25085332 +SHA256 (rust/2025-05-15/cargo-1.87.0-aarch64-unknown-freebsd.tar.xz) = f6fad164c4b3107c531036c9f4aea79f1d5b3138a9212839082068ec14e8069a +SIZE (rust/2025-05-15/cargo-1.87.0-aarch64-unknown-freebsd.tar.xz) = 8864360 +SHA256 (rust/2025-05-15/rustc-1.87.0-x86_64-unknown-freebsd.tar.xz) = 37f413c5af70d678598844e206329f24c3047d38cc43f162a0c6db14b6a5de0c +SIZE (rust/2025-05-15/rustc-1.87.0-x86_64-unknown-freebsd.tar.xz) = 63790236 +SHA256 (rust/2025-05-15/rust-std-1.87.0-x86_64-unknown-freebsd.tar.xz) = 037b982e3cdf2af304647a8dbaf83c310605cbd131b2fd2c436f0a4284581325 +SIZE (rust/2025-05-15/rust-std-1.87.0-x86_64-unknown-freebsd.tar.xz) = 26183840 +SHA256 (rust/2025-05-15/cargo-1.87.0-x86_64-unknown-freebsd.tar.xz) = 9cdffc039d2b449619b81dcd494c399180507faee2b7b5a18ff8fd59aa6215d3 +SIZE (rust/2025-05-15/cargo-1.87.0-x86_64-unknown-freebsd.tar.xz) = 10021928 +SHA256 (rust/2025-05-15/rustc-1.87.0-armv7-unknown-freebsd.tar.xz) = 0115525ad2c7df25ef25338a986e42a0c028ae53cf0c6dbf31a9313197c96832 +SIZE (rust/2025-05-15/rustc-1.87.0-armv7-unknown-freebsd.tar.xz) = 68671404 +SHA256 (rust/2025-05-15/rust-std-1.87.0-armv7-unknown-freebsd.tar.xz) = d37a4ede26f8334b96982321dfa94dbefe50da2cc39fae4ddbeae077e8aded1a +SIZE (rust/2025-05-15/rust-std-1.87.0-armv7-unknown-freebsd.tar.xz) = 24274380 +SHA256 (rust/2025-05-15/cargo-1.87.0-armv7-unknown-freebsd.tar.xz) = 86a86b4661fbbd70ff9c052c4729c01132767785597599f818d6607dc6544b1c +SIZE (rust/2025-05-15/cargo-1.87.0-armv7-unknown-freebsd.tar.xz) = 9116332 +SHA256 (rust/2025-05-15/rustc-1.87.0-i686-unknown-freebsd.tar.xz) = eda4511359f500204726fdca40bd88292c83144d2a4f566c083ac41f8121358a +SIZE (rust/2025-05-15/rustc-1.87.0-i686-unknown-freebsd.tar.xz) = 76629816 +SHA256 (rust/2025-05-15/rust-std-1.87.0-i686-unknown-freebsd.tar.xz) = dfe0645c3913a1852561ab141f01dd90ec678080400d112361c5ade6b324fba2 +SIZE (rust/2025-05-15/rust-std-1.87.0-i686-unknown-freebsd.tar.xz) = 25965172 +SHA256 (rust/2025-05-15/cargo-1.87.0-i686-unknown-freebsd.tar.xz) = a536712e4fd1919b397a2427b5d2080f06d4e9d3f9ef96a4e0ffae8497a3cd6c +SIZE (rust/2025-05-15/cargo-1.87.0-i686-unknown-freebsd.tar.xz) = 10599524 +SHA256 (rust/2025-05-15/rustc-1.87.0-powerpc-unknown-freebsd.tar.xz) = 55eb2f9e15ae7ef4ef8df383f578048e13d81f587ea3689bd708908bf9d4af97 +SIZE (rust/2025-05-15/rustc-1.87.0-powerpc-unknown-freebsd.tar.xz) = 69260664 +SHA256 (rust/2025-05-15/rust-std-1.87.0-powerpc-unknown-freebsd.tar.xz) = bdcaab8444e42a645815b92fe0ea9eb3718c63a42e15eba4f481a13996bb79d0 +SIZE (rust/2025-05-15/rust-std-1.87.0-powerpc-unknown-freebsd.tar.xz) = 23412632 +SHA256 (rust/2025-05-15/cargo-1.87.0-powerpc-unknown-freebsd.tar.xz) = c605ad5c7e73b38c575989796a4dca24bac92f3034703bbed5f4b5d954aa9739 +SIZE (rust/2025-05-15/cargo-1.87.0-powerpc-unknown-freebsd.tar.xz) = 9219908 +SHA256 (rust/2025-05-15/rustc-1.87.0-powerpc64-unknown-freebsd.tar.xz) = 04b22a1eacb30dc7d16d9751baca92a2cec72010c85fc4927267e3b42c0094d3 +SIZE (rust/2025-05-15/rustc-1.87.0-powerpc64-unknown-freebsd.tar.xz) = 67746940 +SHA256 (rust/2025-05-15/rust-std-1.87.0-powerpc64-unknown-freebsd.tar.xz) = a21922d860f19e0b4c642207274c588df1341c6ff622050a0653bb82be40bda6 +SIZE (rust/2025-05-15/rust-std-1.87.0-powerpc64-unknown-freebsd.tar.xz) = 23282608 +SHA256 (rust/2025-05-15/cargo-1.87.0-powerpc64-unknown-freebsd.tar.xz) = 07aca5c0e8dcc8aaea3b7b16751d6191373105d445f73e46139eb16066a146ca +SIZE (rust/2025-05-15/cargo-1.87.0-powerpc64-unknown-freebsd.tar.xz) = 9295388 +SHA256 (rust/2025-05-15/rustc-1.87.0-powerpc64le-unknown-freebsd.tar.xz) = a99e6b9e9713c530337633a5e36d214ae687ba638b7f04c07a9cf659c245c781 +SIZE (rust/2025-05-15/rustc-1.87.0-powerpc64le-unknown-freebsd.tar.xz) = 71448916 +SHA256 (rust/2025-05-15/rust-std-1.87.0-powerpc64le-unknown-freebsd.tar.xz) = 8bd9ba04fe0cf194a1004abca0bc9420a47d0491131c4f6c0b0d8a89ad5b96ea +SIZE (rust/2025-05-15/rust-std-1.87.0-powerpc64le-unknown-freebsd.tar.xz) = 23330908 +SHA256 (rust/2025-05-15/cargo-1.87.0-powerpc64le-unknown-freebsd.tar.xz) = 9a67120c2776d181c1f32e68f8e55a0d05543f439feeb08c1d8ce6d96a1771da +SIZE (rust/2025-05-15/cargo-1.87.0-powerpc64le-unknown-freebsd.tar.xz) = 9794732 +SHA256 (rust/2025-05-15/rustc-1.87.0-riscv64gc-unknown-freebsd.tar.xz) = b4b5c71211e2873461b4fd3108668dfd108e220d7012ed9e2b962912d91a9f19 +SIZE (rust/2025-05-15/rustc-1.87.0-riscv64gc-unknown-freebsd.tar.xz) = 78845668 +SHA256 (rust/2025-05-15/rust-std-1.87.0-riscv64gc-unknown-freebsd.tar.xz) = e79ac7a4449f934b0b6d5699e3080aef3d2d665a128f701a786e847634dd8abf +SIZE (rust/2025-05-15/rust-std-1.87.0-riscv64gc-unknown-freebsd.tar.xz) = 23480648 +SHA256 (rust/2025-05-15/cargo-1.87.0-riscv64gc-unknown-freebsd.tar.xz) = 316fac9c44a37d85ae18a40290f5ce3b064e5326fff3574119322ba191109205 +SIZE (rust/2025-05-15/cargo-1.87.0-riscv64gc-unknown-freebsd.tar.xz) = 11690508 diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs index c711d629e744..dbcbe5771fdd 100644 --- a/lang/rust/files/patch-vendor_cc.rs +++ b/lang/rust/files/patch-vendor_cc.rs @@ -21,8 +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-05-09 18:20:47 UTC -+++ vendor/cc-1.1.22/src/tool.rs +--- 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 { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -34,8 +34,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.0/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.0/src/tool.rs +--- vendor/cc-1.2.16/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.2.16/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -47,8 +47,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.10/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.10/src/tool.rs +--- 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 { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -60,8 +60,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.13/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.13/src/tool.rs +--- vendor/cc-1.2.21/src/tool.rs.orig 2024-05-09 18:20:47 UTC ++++ vendor/cc-1.2.21/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { 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..87c398a91538 --- /dev/null +++ b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c @@ -0,0 +1,27 @@ +/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 +@@ -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) +@@ -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) + 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", |