diff options
-rw-r--r-- | Mk/Uses/cargo.mk | 2 | ||||
-rw-r--r-- | Mk/bsd.gecko.mk | 2 | ||||
-rw-r--r-- | lang/rust-bootstrap/Makefile | 9 | ||||
-rw-r--r-- | lang/rust-bootstrap/distinfo | 6 | ||||
-rw-r--r-- | lang/rust/Makefile | 14 | ||||
-rw-r--r-- | lang/rust/distinfo | 102 | ||||
-rw-r--r-- | lang/rust/files/patch-vendor_cc.rs | 17 | ||||
-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 |
9 files changed, 106 insertions, 83 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index b49a8b80e011..19b0ac1e294e 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.86.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.87.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 7ad89c0e378e..85e3a8900654 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.28.0:devel/rust-cbindgen \ - ${RUST_DEFAULT}>=1.86.0:lang/${RUST_DEFAULT} \ + ${RUST_DEFAULT}>=1.87.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 8460ba7ab2a0..a41ae66c252f 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.86.0 +PORTVERSION= 1.87.0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}- @@ -80,11 +80,11 @@ do-configure: @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh @${ECHO_CMD} '# https://github.com/rust-lang/rust/issues/135358 (bug #947897)' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'profile = "dist"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'profile="dist"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'extended=false' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'extended=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'docs=false' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml @@ -131,8 +131,7 @@ do-configure: do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py dist --jobs=${MAKE_JOBS_NUMBER} \ - cargo rustc rust-std + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py dist --jobs=${MAKE_JOBS_NUMBER} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/rust-bootstrap/${FLAVOR} diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo index e8f0d8ffe076..58cd2197093a 100644 --- a/lang/rust-bootstrap/distinfo +++ b/lang/rust-bootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743576323 -SHA256 (rust/rustc-1.86.0-src.tar.xz) = d939eada065dc827a9d4dbb55bd48533ad14c16e7f0a42e70147029c82a7707b -SIZE (rust/rustc-1.86.0-src.tar.xz) = 275696736 +TIMESTAMP = 1747381480 +SHA256 (rust/rustc-1.87.0-src.tar.xz) = 8623b8651893e8c6aebfa45b6a90645a4f652f7b18189a0992a90d11ac2631f4 +SIZE (rust/rustc-1.87.0-src.tar.xz) = 283604208 diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 5e77bdf85bb6..b3f9e7bcf803 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ PORTNAME= rust -PORTVERSION?= 1.86.0 +PORTVERSION?= 1.87.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/: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-04-03 +RUST_BOOTSTRAP_VERSION?= 1.86.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 @@ -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..7749cc6eb420 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 = 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 diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs index c711d629e744..4bc3a7b24e42 100644 --- a/lang/rust/files/patch-vendor_cc.rs +++ b/lang/rust/files/patch-vendor_cc.rs @@ -60,8 +60,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.13/src/tool.rs.orig 2024-05-09 18:20:47 UTC -+++ vendor/cc-1.2.13/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) { + (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.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) { 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..95c749f9d63b --- /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__) ++#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", |