diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index e3d66469a325..b49a8b80e011 100644 --- 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.85.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.86.0:lang/${RUST_DEFAULT} . elif ${CARGO_BUILDDEP:tl} == "any-version" BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} . endif diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 2cd5eddb32d3..c3691ef94a83 100644 --- 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.85.0:lang/${RUST_DEFAULT} \ + ${RUST_DEFAULT}>=1.86.0:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile index 55100b7bc0a6..8460ba7ab2a0 100644 --- 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.85.0 +PORTVERSION= 1.86.0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}- diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo index ce117d264c94..e8f0d8ffe076 100644 --- a/lang/rust-bootstrap/distinfo +++ b/lang/rust-bootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739890892 -SHA256 (rust/rustc-1.85.0-src.tar.xz) = d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7 -SIZE (rust/rustc-1.85.0-src.tar.xz) = 274011696 +TIMESTAMP = 1743576323 +SHA256 (rust/rustc-1.86.0-src.tar.xz) = d939eada065dc827a9d4dbb55bd48533ad14c16e7f0a42e70147029c82a7707b +SIZE (rust/rustc-1.86.0-src.tar.xz) = 275696736 diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 2d27123116c1..47a06d04c238 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ PORTNAME= rust -PORTVERSION?= 1.85.1 +PORTVERSION?= 1.86.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -60,8 +60,7 @@ WASM_DESC= Build the WebAssembly target (wasm32-unknown-unknown) SSE2_EXTRA_PATCHES_OFF+= ${FILESDIR}/extra-patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs DOCS_VARS= _RUST_BUILD_DOCS=true \ - _COMPONENTS+="rust-docs-${_PACKAGE_VERS}-${_RUST_TARGET} rust-docs-json-${_PACKAGE_VERS}-${_RUST_TARGET}" \ - _RUST_TOOLS+=rustdoc + _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,max=19,lib,noexport @@ -72,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-01-09 -RUST_BOOTSTRAP_VERSION?= 1.84.0 +BOOTSTRAPS_DATE?= 2025-02-20 +RUST_BOOTSTRAP_VERSION?= 1.85.0 CARGO_VENDOR_DIR?= ${WRKSRC}/vendor @@ -83,7 +82,7 @@ _RUST_ARCH_i386= i686 _RUST_ARCH_riscv64= riscv64gc _RUST_TARGET= ${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl} _RUST_TARGETS= ${_RUST_TARGET} -_RUST_TOOLS= analysis cargo clippy rust-analyzer rustfmt +_RUST_TOOLS= analysis cargo clippy rust-analyzer rustdoc rustfmt _RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 61951b1b472a..3b695e33c515 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,51 +1,51 @@ -TIMESTAMP = 1742543442 -SHA256 (rust/rustc-1.85.1-src.tar.xz) = b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266 -SIZE (rust/rustc-1.85.1-src.tar.xz) = 274028992 -SHA256 (rust/2025-01-09/rustc-1.84.0-aarch64-unknown-freebsd.tar.xz) = 5d146dbee6791d188826d20f602e55c3b49ae4ca822ecc5e45df41b8a34df962 -SIZE (rust/2025-01-09/rustc-1.84.0-aarch64-unknown-freebsd.tar.xz) = 64027760 -SHA256 (rust/2025-01-09/rust-std-1.84.0-aarch64-unknown-freebsd.tar.xz) = ceb22132c8845ec4ee937c8a390d9d6e21fc4099a7ea995d9563707213977ba8 -SIZE (rust/2025-01-09/rust-std-1.84.0-aarch64-unknown-freebsd.tar.xz) = 24359008 -SHA256 (rust/2025-01-09/cargo-1.84.0-aarch64-unknown-freebsd.tar.xz) = 7700325e0db2712b42ae61913c68e7c69ea9112aa666668a2b51f9c5854607d8 -SIZE (rust/2025-01-09/cargo-1.84.0-aarch64-unknown-freebsd.tar.xz) = 8276736 -SHA256 (rust/2025-01-09/rustc-1.84.0-x86_64-unknown-freebsd.tar.xz) = 40a0d9dc8d46aae81be8d5fbe7204a23d9c8744dfb76afbebe096982514fde80 -SIZE (rust/2025-01-09/rustc-1.84.0-x86_64-unknown-freebsd.tar.xz) = 59505104 -SHA256 (rust/2025-01-09/rust-std-1.84.0-x86_64-unknown-freebsd.tar.xz) = 2f9e270856ded31930289b8342df072e2af453b451a8e529bb37ff84e1c2c350 -SIZE (rust/2025-01-09/rust-std-1.84.0-x86_64-unknown-freebsd.tar.xz) = 25955632 -SHA256 (rust/2025-01-09/cargo-1.84.0-x86_64-unknown-freebsd.tar.xz) = 7c78774ef73ed1581decad226786d818f0179c183ac8eaea64de2b8a4a57190a -SIZE (rust/2025-01-09/cargo-1.84.0-x86_64-unknown-freebsd.tar.xz) = 9374044 -SHA256 (rust/2025-01-09/rustc-1.84.0-armv7-unknown-freebsd.tar.xz) = 6c4e5d85102ebe12788e188f62f76d52d4a963f1b5d744adfb0470d79936d037 -SIZE (rust/2025-01-09/rustc-1.84.0-armv7-unknown-freebsd.tar.xz) = 64417652 -SHA256 (rust/2025-01-09/rust-std-1.84.0-armv7-unknown-freebsd.tar.xz) = 972f0a9618c82e0a2f31a1a077c923467f49b4fbc83324bdf15e9a1c9851adfc -SIZE (rust/2025-01-09/rust-std-1.84.0-armv7-unknown-freebsd.tar.xz) = 23814768 -SHA256 (rust/2025-01-09/cargo-1.84.0-armv7-unknown-freebsd.tar.xz) = d169a0f62b397b3091265c79850974297c789ecd8d2e5f9bf0150035eb0ff4d1 -SIZE (rust/2025-01-09/cargo-1.84.0-armv7-unknown-freebsd.tar.xz) = 8381320 -SHA256 (rust/2025-01-09/rustc-1.84.0-i686-unknown-freebsd.tar.xz) = 147a2f9df4c84ae6ccf234230b4a59d429dc145a26d2b48f52dc8d30d9cf51a2 -SIZE (rust/2025-01-09/rustc-1.84.0-i686-unknown-freebsd.tar.xz) = 71473768 -SHA256 (rust/2025-01-09/rust-std-1.84.0-i686-unknown-freebsd.tar.xz) = 67a1644e15db18dcc1bc06c895ade68c410a4f94cdb501f8d7a4c46ad4d7cbd0 -SIZE (rust/2025-01-09/rust-std-1.84.0-i686-unknown-freebsd.tar.xz) = 25590568 -SHA256 (rust/2025-01-09/cargo-1.84.0-i686-unknown-freebsd.tar.xz) = 8e8a6f75aa84e514d3ba8fd17bbe31680c886d294a2c814858566897ab551de7 -SIZE (rust/2025-01-09/cargo-1.84.0-i686-unknown-freebsd.tar.xz) = 10034576 -SHA256 (rust/2025-01-09/rustc-1.84.0-powerpc-unknown-freebsd.tar.xz) = 33a6d058d7775f8bbfba81953526b03e1f9ffc508f61fac817803666f96d1d65 -SIZE (rust/2025-01-09/rustc-1.84.0-powerpc-unknown-freebsd.tar.xz) = 65409964 -SHA256 (rust/2025-01-09/rust-std-1.84.0-powerpc-unknown-freebsd.tar.xz) = 6578cef44a61b1fe4f77092c1de7ab476f00565349a81e7d897b8eef50828873 -SIZE (rust/2025-01-09/rust-std-1.84.0-powerpc-unknown-freebsd.tar.xz) = 23075820 -SHA256 (rust/2025-01-09/cargo-1.84.0-powerpc-unknown-freebsd.tar.xz) = 86d1a608a0e38238979565be4f0f7d7c2fed62a198949114e4280937dec2f513 -SIZE (rust/2025-01-09/cargo-1.84.0-powerpc-unknown-freebsd.tar.xz) = 8636360 -SHA256 (rust/2025-01-09/rustc-1.84.0-powerpc64-unknown-freebsd.tar.xz) = f614c5bba7859560d048c3ed097fb7d4836f21f49851d5ecfc22be33ffed389a -SIZE (rust/2025-01-09/rustc-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 63942656 -SHA256 (rust/2025-01-09/rust-std-1.84.0-powerpc64-unknown-freebsd.tar.xz) = ac9d28fd0e9db2b280f3c10d39c6629ce8e4ccf5ec8835c8aeecfd2b93f5d684 -SIZE (rust/2025-01-09/rust-std-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 22959100 -SHA256 (rust/2025-01-09/cargo-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 684b96e12aab967e9fb83c65d6844856dfe60db2767ee78bc91084f662500145 -SIZE (rust/2025-01-09/cargo-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 8339836 -SHA256 (rust/2025-01-09/rustc-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 355b9a56f1219fd94ead6157faeebdfbb256d8203283be6f108575b76958bd02 -SIZE (rust/2025-01-09/rustc-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 66488408 -SHA256 (rust/2025-01-09/rust-std-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 5fc0e3589ff0e5a5ac6e038d8dd78f0e77a8067f7f65462cacdce5b76816bfea -SIZE (rust/2025-01-09/rust-std-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 23196928 -SHA256 (rust/2025-01-09/cargo-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 53c1998bf72b3103df413bfb14cf32c5535aeedf1bcecda49e14a82ded9745f2 -SIZE (rust/2025-01-09/cargo-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 8761296 -SHA256 (rust/2025-01-09/rustc-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 6421bcc6b35af3e3091349869395fc7fa39870c5b0188eaebc0ca887eeb62da6 -SIZE (rust/2025-01-09/rustc-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 72077080 -SHA256 (rust/2025-01-09/rust-std-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = f95b01526345107b5f84ec45f160d5c314372f2002a82005ffdffc8b28a7c1f0 -SIZE (rust/2025-01-09/rust-std-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 23039224 -SHA256 (rust/2025-01-09/cargo-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = ee370bd3e89a947be859e6d482f815a73938496204deccd2cade4deb138fd996 -SIZE (rust/2025-01-09/cargo-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 10640860 +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 diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs index e508c1f7b163..c711d629e744 100644 --- a/lang/rust/files/patch-vendor_cc.rs +++ b/lang/rust/files/patch-vendor_cc.rs @@ -47,8 +47,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.2.6/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.6/src/tool.rs +--- 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 { + + 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.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 { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { diff --git a/lang/rust/files/patch-vendor_git2-0.19.0_src_lib.rs b/lang/rust/files/patch-vendor_git2-0.19.0_src_lib.rs index 612698c459f7..1676f0c23188 100644 --- a/lang/rust/files/patch-vendor_git2-0.19.0_src_lib.rs +++ b/lang/rust/files/patch-vendor_git2-0.19.0_src_lib.rs @@ -1,5 +1,5 @@ ---- vendor/git2-0.19.0/src/lib.rs.orig 2025-02-21 20:02:44 UTC -+++ vendor/git2-0.19.0/src/lib.rs +--- vendor/git2-0.20.0/src/lib.rs.orig 2025-02-21 20:02:44 UTC ++++ vendor/git2-0.20.0/src/lib.rs @@ -759,6 +759,7 @@ fn init() { unix, not(target_os = "macos"), diff --git a/lang/rust/files/patch-vendor_libc-0.2.158 b/lang/rust/files/patch-vendor_libc-0.2.158 deleted file mode 100644 index 6f8b8d093a71..000000000000 --- a/lang/rust/files/patch-vendor_libc-0.2.158 +++ /dev/null @@ -1,745 +0,0 @@ -https://github.com/rust-lang/rust/issues/130677 - -From 9049542fabce9eea669d1fe3d4d973931c9d7d23 Mon Sep 17 00:00:00 2001 -From: Alan Somers -Date: Mon, 23 Sep 2024 10:22:32 -0600 -Subject: [PATCH] Fix the definition of ino_t on 32-bit FreeBSD 12+ - -Commit 7437d0a6f1 erroneously defined it as "ulong" instead of u64. -Nobody noticed the mistake, probably because it was only tested on -64-bit architectures, where those are equivalent. But it's a problem -now, after #3723 , which switched the standard library to a FreeBSD 12 -ABI. - -Issue https://github.com/rust-lang/rust/issues/130677 ---- - src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs | 2 +- - src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs | 2 +- - src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs | 2 +- - src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs | 2 +- - src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs -index de34069eabdf2..68a8364194607 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs -@@ -4,7 +4,7 @@ - pub type nlink_t = u16; - // Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12: - pub type dev_t = u32; --// Type of `ino_t` changed from `unsigned int` to `unsigned long` in FreeBSD 12: -+// Type of `ino_t` changed from `__uint32_t` to `__uint64_t` in FreeBSD 12: - pub type ino_t = u32; - - s! { -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs -index 10fcaa03a4ef6..197400ffb4e28 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs -@@ -2,7 +2,7 @@ - - pub type nlink_t = u64; - pub type dev_t = u64; --pub type ino_t = ::c_ulong; -+pub type ino_t = u64; - pub type shmatt_t = ::c_uint; - - s! { -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs -index ec6bce2a03091..d3a77d03c48d0 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs -@@ -2,7 +2,7 @@ - - pub type nlink_t = u64; - pub type dev_t = u64; --pub type ino_t = ::c_ulong; -+pub type ino_t = u64; - pub type shmatt_t = ::c_uint; - pub type kpaddr_t = u64; - pub type kssize_t = i64; -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs -index 160a4baae481b..9d65317d29cb4 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs -@@ -2,7 +2,7 @@ - - pub type nlink_t = u64; - pub type dev_t = u64; --pub type ino_t = ::c_ulong; -+pub type ino_t = u64; - pub type shmatt_t = ::c_uint; - pub type kpaddr_t = u64; - pub type kssize_t = i64; -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs -index d73215a68ec33..f76208400f324 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs -@@ -2,7 +2,7 @@ - - pub type nlink_t = u64; - pub type dev_t = u64; --pub type ino_t = ::c_ulong; -+pub type ino_t = u64; - pub type shmatt_t = ::c_uint; - pub type kpaddr_t = u64; - pub type kssize_t = i64; - - -From 8aca9c0126f3aa5a7dce1ad7fc016b4a0d6af70a Mon Sep 17 00:00:00 2001 -From: Alan Somers -Date: Mon, 23 Sep 2024 10:44:13 -0600 -Subject: [PATCH] Fix the definition of "struct stat" on 32-bit FreeBSD 12+ - -The original definitions were never correct. But nobody noticed because -we don't do CI on 32-bit FreeBSD. The problem is apparent now due to - #3723 , which caused the nightly toolchain to switch to a FreeBSD 12 -ABI. - -Fixes https://github.com/rust-lang/rust/issues/130677 ---- - .../{freebsd12/b64.rs => freebsd11/b32.rs} | 13 +++--- - .../bsd/freebsdlike/freebsd/freebsd11/mod.rs | 7 +-- - .../bsd/freebsdlike/freebsd/freebsd12/mod.rs | 43 +++++++++++++++---- - .../bsd/freebsdlike/freebsd/freebsd13/b64.rs | 34 --------------- - .../bsd/freebsdlike/freebsd/freebsd13/mod.rs | 43 +++++++++++++++---- - .../bsd/freebsdlike/freebsd/freebsd14/b64.rs | 34 --------------- - .../bsd/freebsdlike/freebsd/freebsd14/mod.rs | 43 +++++++++++++++---- - .../bsd/freebsdlike/freebsd/freebsd15/b64.rs | 34 --------------- - .../bsd/freebsdlike/freebsd/freebsd15/mod.rs | 43 +++++++++++++++---- - src/unix/bsd/freebsdlike/freebsd/x86.rs | 25 ----------- - 10 files changed, 146 insertions(+), 173 deletions(-) - rename src/unix/bsd/freebsdlike/freebsd/{freebsd12/b64.rs => freebsd11/b32.rs} (89%) - delete mode 100644 src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs - delete mode 100644 src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs - delete mode 100644 src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs - -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs -similarity index 89% -rename from src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs -rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs - ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig 2024-10-24 17:21:07.154172000 +0200 -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs 2024-10-24 17:21:02.029962000 +0200 -@@ -0,0 +1,34 @@ -+#[repr(C)] -+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))] -+pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_nlink: ::nlink_t, -+ pub st_mode: ::mode_t, -+ st_padding0: i16, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ st_padding1: i32, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u64, -+ pub st_spare: [u64; 10], -+} -+ -+impl ::Copy for ::stat {} -+impl ::Clone for ::stat { -+ fn clone(&self) -> ::stat { -+ *self -+ } -+} - - -index 80c6fa1684530..5c1156581fd61 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs -@@ -3,12 +3,10 @@ - pub struct stat { - pub st_dev: ::dev_t, - pub st_ino: ::ino_t, -- pub st_nlink: ::nlink_t, - pub st_mode: ::mode_t, -- st_padding0: i16, -+ pub st_nlink: ::nlink_t, - pub st_uid: ::uid_t, - pub st_gid: ::gid_t, -- st_padding1: i32, - pub st_rdev: ::dev_t, - pub st_atime: ::time_t, - pub st_atime_nsec: ::c_long, -@@ -16,14 +14,15 @@ pub struct stat { - pub st_mtime_nsec: ::c_long, - pub st_ctime: ::time_t, - pub st_ctime_nsec: ::c_long, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, - pub st_size: ::off_t, - pub st_blocks: ::blkcnt_t, - pub st_blksize: ::blksize_t, - pub st_flags: ::fflags_t, -- pub st_gen: u64, -- pub st_spare: [u64; 10], -+ pub st_gen: u32, -+ pub st_lspare: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ __unused: [u8; 8], - } - - impl ::Copy for ::stat {} -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs -index 68a8364194607..e416ebf745841 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs -@@ -479,10 +479,11 @@ extern "C" { - } - - cfg_if! { -- if #[cfg(any(target_arch = "x86_64", -- target_arch = "aarch64", -- target_arch = "riscv64"))] { -+ if #[cfg(target_pointer_width = "64")] { - mod b64; - pub use self::b64::*; -+ } else { -+ mod b32; -+ pub use self::b32::*; - } - } -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs -index 197400ffb4e28..c4431a6458e8f 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs -@@ -218,6 +218,40 @@ s! { - /// kthread flag. - pub ki_tdflags: ::c_long, - } -+ -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_nlink: ::nlink_t, -+ pub st_mode: ::mode_t, -+ st_padding0: i16, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ st_padding1: i32, -+ pub st_rdev: ::dev_t, -+ #[cfg(target_arch = "x86")] -+ st_atim_ext: i32, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_mtim_ext: i32, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_ctim_ext: i32, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_btim_ext: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u64, -+ pub st_spare: [u64; 10], -+ } - } - - s_no_extra_traits! { -@@ -488,15 +522,6 @@ extern "C" { - pub fn basename(path: *mut ::c_char) -> *mut ::c_char; - } - --cfg_if! { -- if #[cfg(any(target_arch = "x86_64", -- target_arch = "aarch64", -- target_arch = "riscv64"))] { -- mod b64; -- pub use self::b64::*; -- } --} -- - cfg_if! { - if #[cfg(target_arch = "x86_64")] { - mod x86_64; -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs -deleted file mode 100644 -index 80c6fa1684530..0000000000000 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs -+++ /dev/null -@@ -1,34 +0,0 @@ --#[repr(C)] --#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))] --pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_nlink: ::nlink_t, -- pub st_mode: ::mode_t, -- st_padding0: i16, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- st_padding1: i32, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u64, -- pub st_spare: [u64; 10], --} -- --impl ::Copy for ::stat {} --impl ::Clone for ::stat { -- fn clone(&self) -> ::stat { -- *self -- } --} -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs -index d3a77d03c48d0..118404e8b089b 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs -@@ -228,6 +228,40 @@ s! { - /// kthread flag. - pub ki_tdflags: ::c_long, - } -+ -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_nlink: ::nlink_t, -+ pub st_mode: ::mode_t, -+ st_padding0: i16, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ st_padding1: i32, -+ pub st_rdev: ::dev_t, -+ #[cfg(target_arch = "x86")] -+ st_atim_ext: i32, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_mtim_ext: i32, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_ctim_ext: i32, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_btim_ext: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u64, -+ pub st_spare: [u64; 10], -+ } - } - - s_no_extra_traits! { -@@ -529,15 +563,6 @@ extern "C" { - pub fn kvm_kerndisp(kd: *mut ::kvm_t) -> ::kssize_t; - } - --cfg_if! { -- if #[cfg(any(target_arch = "x86_64", -- target_arch = "aarch64", -- target_arch = "riscv64"))] { -- mod b64; -- pub use self::b64::*; -- } --} -- - cfg_if! { - if #[cfg(target_arch = "x86_64")] { - mod x86_64; -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs -deleted file mode 100644 -index 80c6fa1684530..0000000000000 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs -+++ /dev/null -@@ -1,34 +0,0 @@ --#[repr(C)] --#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))] --pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_nlink: ::nlink_t, -- pub st_mode: ::mode_t, -- st_padding0: i16, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- st_padding1: i32, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u64, -- pub st_spare: [u64; 10], --} -- --impl ::Copy for ::stat {} --impl ::Clone for ::stat { -- fn clone(&self) -> ::stat { -- *self -- } --} -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs -index 9d65317d29cb4..e624dd7201b0a 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs -@@ -228,6 +228,40 @@ s! { - /// kthread flag. - pub ki_tdflags: ::c_long, - } -+ -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_nlink: ::nlink_t, -+ pub st_mode: ::mode_t, -+ st_padding0: i16, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ st_padding1: i32, -+ pub st_rdev: ::dev_t, -+ #[cfg(target_arch = "x86")] -+ st_atim_ext: i32, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_mtim_ext: i32, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_ctim_ext: i32, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_btim_ext: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u64, -+ pub st_spare: [u64; 10], -+ } - } - - s_no_extra_traits! { -@@ -529,15 +563,6 @@ extern "C" { - pub fn kvm_kerndisp(kd: *mut ::kvm_t) -> ::kssize_t; - } - --cfg_if! { -- if #[cfg(any(target_arch = "x86_64", -- target_arch = "aarch64", -- target_arch = "riscv64"))] { -- mod b64; -- pub use self::b64::*; -- } --} -- - cfg_if! { - if #[cfg(target_arch = "x86_64")] { - mod x86_64; -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs -deleted file mode 100644 -index 80c6fa1684530..0000000000000 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs -+++ /dev/null -@@ -1,34 +0,0 @@ --#[repr(C)] --#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))] --pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_nlink: ::nlink_t, -- pub st_mode: ::mode_t, -- st_padding0: i16, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- st_padding1: i32, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u64, -- pub st_spare: [u64; 10], --} -- --impl ::Copy for ::stat {} --impl ::Clone for ::stat { -- fn clone(&self) -> ::stat { -- *self -- } --} -diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs -index f76208400f324..a299af7d5d53e 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs -@@ -228,6 +228,40 @@ s! { - /// kthread flag. - pub ki_tdflags: ::c_long, - } -+ -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_nlink: ::nlink_t, -+ pub st_mode: ::mode_t, -+ st_padding0: i16, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ st_padding1: i32, -+ pub st_rdev: ::dev_t, -+ #[cfg(target_arch = "x86")] -+ st_atim_ext: i32, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_mtim_ext: i32, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_ctim_ext: i32, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ #[cfg(target_arch = "x86")] -+ st_btim_ext: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u64, -+ pub st_spare: [u64; 10], -+ } - } - - s_no_extra_traits! { -@@ -529,15 +563,6 @@ extern "C" { - pub fn kvm_kerndisp(kd: *mut ::kvm_t) -> ::kssize_t; - } - --cfg_if! { -- if #[cfg(any(target_arch = "x86_64", -- target_arch = "aarch64", -- target_arch = "riscv64"))] { -- mod b64; -- pub use self::b64::*; -- } --} -- - cfg_if! { - if #[cfg(target_arch = "x86_64")] { - mod x86_64; -diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs -index c3c576ed66681..31a660e7d0a22 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/x86.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/x86.rs -@@ -42,31 +42,6 @@ s_no_extra_traits! { - } - - s! { -- pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_mode: ::mode_t, -- pub st_nlink: ::nlink_t, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u32, -- pub st_lspare: i32, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- __unused: [u8; 8], -- } -- - pub struct ucontext_t { - pub uc_sigmask: ::sigset_t, - pub uc_mcontext: ::mcontext_t, - - -From f381e010b2439579c9f548ef86fb06409c2c55d2 Mon Sep 17 00:00:00 2001 -From: Alan Somers -Date: Mon, 23 Sep 2024 16:03:48 -0600 -Subject: [PATCH] fixup: fix build on powerpc, powerpc64, and arm - ---- - src/unix/bsd/freebsdlike/freebsd/arm.rs | 30 ------------------- - src/unix/bsd/freebsdlike/freebsd/powerpc.rs | 26 ---------------- - src/unix/bsd/freebsdlike/freebsd/powerpc64.rs | 26 ---------------- - 3 files changed, 82 deletions(-) - -diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs -index 300b3dd45ca9d..8ff500c65981c 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/arm.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/arm.rs -@@ -6,36 +6,6 @@ pub type time_t = i64; - pub type suseconds_t = i32; - pub type register_t = i32; - --s! { -- pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_mode: ::mode_t, -- pub st_nlink: ::nlink_t, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_atime_pad: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_mtime_pad: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_ctime_pad: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u32, -- pub st_lspare: i32, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- pub st_birthtime_pad: ::c_long, -- } --} -- - // should be pub(crate), but that requires Rust 1.18.0 - cfg_if! { - if #[cfg(libc_const_size_of)] { -diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs -index a0120c337e0ad..f84062ba34b93 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/powerpc.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/powerpc.rs -@@ -6,32 +6,6 @@ pub type time_t = i64; - pub type suseconds_t = i32; - pub type register_t = i32; - --s! { -- pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_mode: ::mode_t, -- pub st_nlink: ::nlink_t, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u32, -- pub st_lspare: i32, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- } --} -- - // should be pub(crate), but that requires Rust 1.18.0 - cfg_if! { - if #[cfg(libc_const_size_of)] { -diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -index 7f5b9752264e3..69cf4c5fc88c7 100644 ---- vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -+++ vendor/libc-0.2.158/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -@@ -6,32 +6,6 @@ pub type time_t = i64; - pub type suseconds_t = i64; - pub type register_t = i64; - --s! { -- pub struct stat { -- pub st_dev: ::dev_t, -- pub st_ino: ::ino_t, -- pub st_mode: ::mode_t, -- pub st_nlink: ::nlink_t, -- pub st_uid: ::uid_t, -- pub st_gid: ::gid_t, -- pub st_rdev: ::dev_t, -- pub st_atime: ::time_t, -- pub st_atime_nsec: ::c_long, -- pub st_mtime: ::time_t, -- pub st_mtime_nsec: ::c_long, -- pub st_ctime: ::time_t, -- pub st_ctime_nsec: ::c_long, -- pub st_size: ::off_t, -- pub st_blocks: ::blkcnt_t, -- pub st_blksize: ::blksize_t, -- pub st_flags: ::fflags_t, -- pub st_gen: u32, -- pub st_lspare: i32, -- pub st_birthtime: ::time_t, -- pub st_birthtime_nsec: ::c_long, -- } --} -- - // should be pub(crate), but that requires Rust 1.18.0 - cfg_if! { - if #[cfg(libc_const_size_of)] {