diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 821aa14d12bc..001da1136e21 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.320 2024/11/14 22:20:32 wiz Exp $ +# $NetBSD: Makefile,v 1.321 2024/11/24 16:13:42 he Exp $ -DISTNAME= rustc-1.80.1-src +DISTNAME= rustc-1.81.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} -PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ @@ -20,6 +19,13 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= bash grep gmake perl:build pkg-config +# This is a bug: +# https://github.com/rust-lang/rust/issues/130708 +# "Building rust 1.81.0 does network access in the "build" phase" +# but set it for now to allow progress in finding other build issues. +#ALLOW_NETWORK_ACCESS= yes +# Ref. dist.vendor below. + # The NetBSD bootstraps are built for NetBSD 9 (because rust doesn't # build on 8 or earlier), or because the target didn't exist in 8 # or 9 (as in riscv64). Therefore, mark earlier versions as broken. @@ -42,6 +48,8 @@ CONFIGURE_ARGS+= --disable-compiler-docs CONFIGURE_ARGS+= --disable-llvm-static-stdcpp CONFIGURE_ARGS+= --disable-ninja CONFIGURE_ARGS+= --dist-compression-formats=xz +# Ref. issue #130708 & backport of pull-request 130110 +CONFIGURE_ARGS+= --set dist.vendor=false # Include (optional) settings to cross-build rust .include "cross.mk" @@ -201,52 +209,50 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64 # DISTFILES:= ${DEFAULT_DISTFILES} -NB= nb1 - .if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= aarch64-apple-darwin RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= x86_64-apple-darwin RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MLinux-*-aarch64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= aarch64-unknown-linux-gnu RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MLinux-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= arm-unknown-linux-gnueabihf RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MLinux-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= armv7-unknown-linux-gnueabihf RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= i686-unknown-linux-gnu RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MLinux-*-x86_64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= x86_64-unknown-linux-gnu RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -258,7 +264,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} # x86_64-sun-solaris bootstrap and comment out the overrides. # .if ${MACHINE_PLATFORM:MSunOS-*-x86_64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= x86_64-unknown-illumos RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz SITES.${RUST_STAGE0}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/ @@ -271,14 +277,14 @@ CONFIGURE_ARGS+= --host=${RUST_ARCH} CONFIGURE_ARGS+= --target=${RUST_ARCH} .endif .if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH:= x86_64-unknown-freebsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH= i586-unknown-netbsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz @@ -298,14 +304,14 @@ pre-build-fix-paxctl: ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc .endif .if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH= x86_64-unknown-netbsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH= powerpc-unknown-netbsd # Cross-built against NetBSD 9.0 @@ -317,10 +323,10 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} .endif .if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH= aarch64-unknown-netbsd -RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz -RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz +RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} @@ -335,7 +341,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} .endif .if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_ARCH= sparc64-unknown-netbsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz @@ -345,25 +351,25 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} .endif .if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= armv7-unknown-netbsd-eabihf -RUST_STAGE0_VER= 1.79.0 -RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz -RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz +RUST_STAGE0_VER= 1.80.1 +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz +RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} .endif .if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= armv6-unknown-netbsd-eabihf -RUST_STAGE0_VER= 1.79.0 -RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz -RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz +RUST_STAGE0_VER= 1.80.1 +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz +RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} .endif #.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi) #RUST_ARCH= mipsel-unknown-netbsd -#RUST_STAGE0_VER= 1.79.0 +#RUST_STAGE0_VER= 1.80.1 #RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz #RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz #DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} @@ -372,7 +378,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} #.endif .if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= riscv64gc-unknown-netbsd -RUST_STAGE0_VER= 1.79.0 +RUST_STAGE0_VER= 1.80.1 RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} @@ -432,10 +438,6 @@ CKSUM_CRATES+= vendor/libc-0.2.155 CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820 CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6 -CKSUM_CRATES+= vendor/libc-0.2.154 -CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820 -CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6 - CKSUM_CRATES+= vendor/zerocopy-0.7.32 CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27 CKSUMS+= abe079743c2b2dea5b2c42564f98741a5eb9e24ff019e01742ace5581e53c06f @@ -456,6 +458,18 @@ CKSUMS+= 1b26fca824c410077780fbc2f4c53c1d195ba3bdf6785b529ceb0a11f039cec2 CKSUMS+= 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b CKSUMS+= 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0 +CKSUM_CRATES+= vendor/memchr-2.7.4 +CKSUMS+= 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0 +CKSUMS+= 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450 +CKSUMS+= 7763472d43c66df596ca0697c07db0b4666d38a6a14f64f9f298aaf756c4a715 +CKSUMS+= 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af +CKSUMS+= 3b15d5cb9715f26e655598eacbb8bbba74cbe8ddb2fb969d13aa75f216a118dd +CKSUMS+= 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af +CKSUMS+= 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b +CKSUMS+= 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0 +CKSUMS+= 44cd1a614bd66f1e66fc86c541d3c3b8d3a14a644c13e8bf816df3f555eac2d4 +CKSUMS+= 27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720 + CKSUM_CRATES+= vendor/memchr-2.7.1 CKSUMS+= 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0 CKSUMS+= 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450 @@ -634,7 +648,7 @@ stage0-bootstrap: install ${CP} `${PKG_CC} -print-file-name=$${lib}` \ ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ done; \ - for lib in libLLVM-17.so libcrypto.so.3 libcurl.so.4 \ + for lib in libLLVM.so.18.1 libcrypto.so.3 libcurl.so.4 \ libssl.so.3 libz.so.1 libzstd.so.1; do \ ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ done; \ diff --git a/lang/rust/cargo.mk b/lang/rust/cargo.mk index 346f97815469..5a3ed0cf8306 100644 --- a/lang/rust/cargo.mk +++ b/lang/rust/cargo.mk @@ -1,4 +1,4 @@ -# $NetBSD: cargo.mk,v 1.39 2024/10/11 12:42:10 jperkin Exp $ +# $NetBSD: cargo.mk,v 1.40 2024/11/24 16:13:42 he Exp $ # # Common logic that can be used by packages that depend on cargo crates # from crates.io. This lets existing pkgsrc infrastructure fetch and verify diff --git a/lang/rust/cross.mk b/lang/rust/cross.mk index 3116278f445a..8e3d681e7812 100644 --- a/lang/rust/cross.mk +++ b/lang/rust/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.11 2023/07/10 12:01:24 he Exp $ +# $NetBSD: cross.mk,v 1.12 2024/11/24 16:13:42 he Exp $ # These settings may be used to cross-build rust. # @@ -13,6 +13,7 @@ # to do a cross-build. The wrapper script assumes dest/ and tools/ # as a result of a cross-build of NetBSD as subdirectories of this root #CROSS_ROOT= /u/evbarm-armv7hf +#CROSS_ROOT= /u/evbarm-armv7hf-10.0 #CROSS_ROOT= /u/evbarm-armv6hf #CROSS_ROOT= /u/sparc64 #CROSS_ROOT= /u/macppc diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 3e50e1ec82ce..fbba1ce04575 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,114 +1,114 @@ -$NetBSD: distinfo,v 1.175 2024/10/13 19:04:39 he Exp $ +$NetBSD: distinfo,v 1.176 2024/11/24 16:13:42 he Exp $ -BLAKE2s (rust-1.79.0-aarch64-apple-darwin.tar.gz) = 9f50d07420f6344cdc67198ee3194b5fed2957260dd5dddc054a7af8c53d9afd -SHA512 (rust-1.79.0-aarch64-apple-darwin.tar.gz) = d46685ba1542ea3c6f4e514d49538c41e21c8117d45a2cf1c7724604e5eb86a3a6e3a830fec271b117d52b2896fd77bc5b35aaa35e7e5e937f43ec34870d5fb9 -Size (rust-1.79.0-aarch64-apple-darwin.tar.gz) = 333587301 bytes -BLAKE2s (rust-1.79.0-aarch64-unknown-linux-gnu.tar.gz) = 136afff99dc44f6744beb9fed6deab00a8f43ba52b58d1425c65abea62ffef29 -SHA512 (rust-1.79.0-aarch64-unknown-linux-gnu.tar.gz) = 2c7da6e98a3e4e253e52fcdbcccc9dedfdb318245d01ffa487b7c0e4a08be57074e5729c078656df1a4a62b3152b0d9570de5c7436a4e5e85706987f6cd0678c -Size (rust-1.79.0-aarch64-unknown-linux-gnu.tar.gz) = 477659187 bytes -BLAKE2s (rust-1.79.0-aarch64-unknown-netbsd-nb1.tar.xz) = c86fcc8553ab79979a707069f8601c7cfeeaff2ca098b2fda98e09829a29f371 -SHA512 (rust-1.79.0-aarch64-unknown-netbsd-nb1.tar.xz) = 71900dcb88166b7325aeb989d8e393963b4f4d175840edc7346b2d9a21cc533f1db6e9d6d79908016f67a7fee335f914f599381a858b30572ca89a49512a1ece -Size (rust-1.79.0-aarch64-unknown-netbsd-nb1.tar.xz) = 170829728 bytes -BLAKE2s (rust-1.79.0-arm-unknown-linux-gnueabihf.tar.gz) = 0bda605889f1664f1d007ecc8896ac4bd879372a7daea63ca3ac85775f28d9b7 -SHA512 (rust-1.79.0-arm-unknown-linux-gnueabihf.tar.gz) = 1194a450e5d977214dc3e73c303e6e2f3de0777957d16ec6c6bbb5bac8ea79b09b878cd7764ac59ec141f21b68107117c9e24da4defd5375f69b3fb8b9bd9a18 -Size (rust-1.79.0-arm-unknown-linux-gnueabihf.tar.gz) = 363633916 bytes -BLAKE2s (rust-1.79.0-armv6-unknown-netbsd-eabihf-nb1.tar.xz) = bb347bcf94c7bf4534abd9fec799072badd3b2581c5089217864f44396c2a04e -SHA512 (rust-1.79.0-armv6-unknown-netbsd-eabihf-nb1.tar.xz) = 4417738b8593db3b1cb21f1f1389640a33ec4b000f5fe76964a14a8bf0520b5c30f0ccf513f610d2dd47f7886b84bbe978574dcaa50d93ce690557170500b410 -Size (rust-1.79.0-armv6-unknown-netbsd-eabihf-nb1.tar.xz) = 146628408 bytes -BLAKE2s (rust-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz) = edf09f1edba4afd399bfc6bea239ab48ae1989187909aeb8f1181f190d38c69b -SHA512 (rust-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz) = 81399eccfd2766a31a824ec8130f8018c3abe668a7f86f6918780bebf761183063d1bf1af154f54cb44930e1ca755f451c654b24c9f20e00162481f0021e5167 -Size (rust-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz) = 351946164 bytes -BLAKE2s (rust-1.79.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = cda96f407be700f67fd6b68e9f631d9a8119c794a1df497553336883f6318b98 -SHA512 (rust-1.79.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = 7cec5490e07d18e8b5aaf5a27f758e38b77c6c54b2296187a06bd37c98da499a952835dd015c030800f095821f3d60211e23ceedee594ca0328a18d92ab8c264 -Size (rust-1.79.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = 149672748 bytes -BLAKE2s (rust-1.79.0-i586-unknown-netbsd.tar.xz) = 059c032bb835c281da45c95a979ef0d99ed2911b4b86c6a58841f471e738d11f -SHA512 (rust-1.79.0-i586-unknown-netbsd.tar.xz) = 46f32ec247c2ae87e3414c262eb726bb7988341bcb9b37ed23b8ad4d6480cc8207657f2d18c0c9302292bbf2bcb806d85fd7b4f986579f00dc15b8178be593c9 -Size (rust-1.79.0-i586-unknown-netbsd.tar.xz) = 185694828 bytes -BLAKE2s (rust-1.79.0-i686-unknown-linux-gnu.tar.gz) = 31d7466f796971968a518084ae9e2d2707f1f6e60957b661d587e8eba7254c80 -SHA512 (rust-1.79.0-i686-unknown-linux-gnu.tar.gz) = b2972d14c5dbb12df7b57cf2aed0d0402f2b8295b0fc80da7fd385803da03d63ab8d5e27c7d6693bdbe5802597d130e9fc9667bca616e5cc81d283c23fe347c7 -Size (rust-1.79.0-i686-unknown-linux-gnu.tar.gz) = 429029849 bytes -BLAKE2s (rust-1.79.0-powerpc-unknown-netbsd.tar.xz) = 7885fb1fe5077ad82bdeb560bb9af4c21eabe9a3ff9f6afcd9e9f1dd1d641c7c -SHA512 (rust-1.79.0-powerpc-unknown-netbsd.tar.xz) = 60820e694a88e85eda6f333c77950ee7b3adf67b3071b15c93220b120d0ce72ee54daf959e824e52d9ff0bfd76d0786db75d3aa2b2b17e1fb04475464c9a3076 -Size (rust-1.79.0-powerpc-unknown-netbsd.tar.xz) = 198348404 bytes -BLAKE2s (rust-1.79.0-riscv64gc-unknown-netbsd.tar.xz) = bb67f5cdd034cf0bb3a873396de7090721254a6734556886f8f93e11cd1d8a03 -SHA512 (rust-1.79.0-riscv64gc-unknown-netbsd.tar.xz) = 2ddd905d72ddb65cd5ed84b09169983374c2e9868a375f77a477c8e1efe47e0fa72d894fd38ac6cc57e8dfef3a09bb16aa87eef42f1fb222ea287e90c923fe98 -Size (rust-1.79.0-riscv64gc-unknown-netbsd.tar.xz) = 187669196 bytes -BLAKE2s (rust-1.79.0-sparc64-unknown-netbsd.tar.xz) = a1f76c31603cfc04d44a606f9be7a3fb0c50be5ed9f83f7e265fc4dcf89172a2 -SHA512 (rust-1.79.0-sparc64-unknown-netbsd.tar.xz) = 7671b15ed3290ee9ea1541b0770cd970c7baf6a9fcd615ae0757cd972665d9cf2e1ac54c47f89a8e45263c62090016852957778f78cf889d457aa6b1363008fb -Size (rust-1.79.0-sparc64-unknown-netbsd.tar.xz) = 167745612 bytes -BLAKE2s (rust-1.79.0-x86_64-apple-darwin.tar.gz) = 748d746565059239c098d3ecd03c12821393dd4c0202b4071265cb8dc4c19d69 -SHA512 (rust-1.79.0-x86_64-apple-darwin.tar.gz) = 978cacdb6c4e5d4b38a1b28eaaca38ed0eeb81bf67f68bdda2f6fde19da80b4bb58f4b305c661df51a4ee9085a7d2ee0859e89167afbe87806373af77363416b -Size (rust-1.79.0-x86_64-apple-darwin.tar.gz) = 338174040 bytes -BLAKE2s (rust-1.79.0-x86_64-unknown-freebsd.tar.gz) = 2be5e32b34aa254bdf24e59f5f58f7814926db30cf740df52d16b7fd5e08f99c -SHA512 (rust-1.79.0-x86_64-unknown-freebsd.tar.gz) = 886e21c494d2bcaab307f51c66033bcda76100028804c86fcbb25c5eaab329b4cb05d060350270fc98e1291d6c6fea1dcf0c71668cc74517a4b405f6078c8fa2 -Size (rust-1.79.0-x86_64-unknown-freebsd.tar.gz) = 321707464 bytes -BLAKE2s (rust-1.79.0-x86_64-unknown-illumos.tar.gz) = 935497255d398ab3264d8be8072836c7934ecdf136007b439b33ff5cbb1fbc25 -SHA512 (rust-1.79.0-x86_64-unknown-illumos.tar.gz) = 992bba31f2a17c9076ac265736f692b700afd957bce2058286930bf180ef01a931f0d56c0834194d245bc826d00bc88e8edb4f3ee3b5048f047e6eaa427b6e1d -Size (rust-1.79.0-x86_64-unknown-illumos.tar.gz) = 213199204 bytes -BLAKE2s (rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 62b441a4f50d7cf43ac0fc88d7f8cfa130660e631e7e054fb8ac09add329f497 -SHA512 (rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 70ce4774fea419b09b6ce4cce3de5392070d07db62c05c67964bd5317bf8de521705330c2bbbd6ad8418ca4e1cb37bfce8def83bdde9577fd66a57fbe48bc78e -Size (rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 329537108 bytes -BLAKE2s (rust-1.79.0-x86_64-unknown-netbsd.tar.xz) = 4971fcf283e43e1b3b2bc3819da73d9e8991537aece847d321d9972457f4b18c -SHA512 (rust-1.79.0-x86_64-unknown-netbsd.tar.xz) = 7b1b94da389b79afce60e769578defd9bcec6427c95071ebf9556dee70a958e7cc38d40f3fb24a26955c2d662c4a2114657ed25f7091b0a282666505b89dde40 -Size (rust-1.79.0-x86_64-unknown-netbsd.tar.xz) = 163729172 bytes +BLAKE2s (rust-1.80.1-aarch64-apple-darwin.tar.gz) = e8552097f84ea7683be3df74148257cbe54765153550e080d7a107086f394e0f +SHA512 (rust-1.80.1-aarch64-apple-darwin.tar.gz) = 235810513a0020e712d09b4cc881f5bf093fe31c2e83107ddc0aaa3aa25060a99dc18ad9ec4ea94515bde4ddba6341b45b09f9b896a4aa3cf40c332fb8c4a2c9 +Size (rust-1.80.1-aarch64-apple-darwin.tar.gz) = 338216464 bytes +BLAKE2s (rust-1.80.1-aarch64-unknown-linux-gnu.tar.gz) = acbb838e3febb199614208376dbf73951a7e1318c25c65e046203e446338e51a +SHA512 (rust-1.80.1-aarch64-unknown-linux-gnu.tar.gz) = 06dc6a3b05fbbb28c915056168c4dc8c3b5d5d52c7c77ef86454e3219dc509f8d8eca0ad636e417a79638f2ace59dfd32d038069d89b0518f209eaf31b7aed5e +Size (rust-1.80.1-aarch64-unknown-linux-gnu.tar.gz) = 484810238 bytes +BLAKE2s (rust-1.80.1-aarch64-unknown-netbsd.tar.xz) = 61cea37dd5792f492c2644f7f21ec2c61b37ffb537d593848dd792773ca86af6 +SHA512 (rust-1.80.1-aarch64-unknown-netbsd.tar.xz) = aa8dd128a1abfd5a740f738fbc115c36dceb6997834d1eff6de73a7bea941426569dd154058ce0167d91bd7fd607fa1f7b96a0aaed22af3d1f98365db1d72a7f +Size (rust-1.80.1-aarch64-unknown-netbsd.tar.xz) = 172190840 bytes BLAKE2s (rust-1.80.1-aarch64_be-unknown-netbsd.tar.xz) = 269594581c9530022621bf1ff077b55655ab86c71dd165a2eab6afaeb85711c3 SHA512 (rust-1.80.1-aarch64_be-unknown-netbsd.tar.xz) = 9af9f238a5b51757271f39c6ddc78b294768679ee2cd931f4c8d81022f0d9c91b31e9ff9a73a76d109e9ae87f494138a64f3320adf130b2dc42ae3caacfa4e2d Size (rust-1.80.1-aarch64_be-unknown-netbsd.tar.xz) = 170426396 bytes -BLAKE2s (rust-std-1.79.0-aarch64-apple-darwin.tar.gz) = 2a9c0de6207701699e0c1b7d68ea43e26d857e4d43d61ee4fbc28ae77b0017fa -SHA512 (rust-std-1.79.0-aarch64-apple-darwin.tar.gz) = 431074b739f6fb9e21c68af8484e0bc3c496fde2be18e55ccb576514c76248775ca1bb5c9477b6062c9e0e5f68fedf9a18ff34e20ecf50a11157bd4c9dd4284a -Size (rust-std-1.79.0-aarch64-apple-darwin.tar.gz) = 40079416 bytes -BLAKE2s (rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.gz) = 3143b18f7c86960717f04941efacaeebbf16363ce2db53e825afb0c2e47b688d -SHA512 (rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.gz) = b24d93f4d2b715912f097e6774570e6f8753e260b1f89043932a8ef8645266b4c63d7b4814364a96a5f77b08ab4bbe603bf053f000f8c8a8c8ad6115e8da39e2 -Size (rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.gz) = 64793520 bytes -BLAKE2s (rust-std-1.79.0-aarch64-unknown-netbsd-nb1.tar.xz) = fb51ee6c651efd914bfd99d66aebaa1539275335ef623a940434c35145c237d4 -SHA512 (rust-std-1.79.0-aarch64-unknown-netbsd-nb1.tar.xz) = a5c46b0ad9820e78ea7ee93ead375d7e62506255d6816eb8682a859a791cca87e79d7a7a15f65b65f7669bd73de4e52dee9e4ff6a94458c3b61cc8b4acb121de -Size (rust-std-1.79.0-aarch64-unknown-netbsd-nb1.tar.xz) = 22716260 bytes -BLAKE2s (rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.gz) = ce68e3890deebf05625baf3e092861a290a3aa50aee1684810b3a35f0310e192 -SHA512 (rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.gz) = ffac025928a27c71979b71c577ef98fed87c2defafb2dadc48a0e2fbe13a54a6489422abb72d1508c6794ad94c73e7e562156c91d5ff1cc51275e67eefe75772 -Size (rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.gz) = 36633906 bytes -BLAKE2s (rust-std-1.79.0-armv6-unknown-netbsd-eabihf-nb1.tar.xz) = ea9792eb9210d3d6f954a5419d4d1f3fe0f968126fa024bff63e0b44944c3f23 -SHA512 (rust-std-1.79.0-armv6-unknown-netbsd-eabihf-nb1.tar.xz) = d4df5ddb3b1684d6d0b708ac99693b59141bfa0ace14e9a96903cf8cab30e4b51f296a52167a9f7dd423f414211d60a1fdbadd3629c39d11550f3b82570688d4 -Size (rust-std-1.79.0-armv6-unknown-netbsd-eabihf-nb1.tar.xz) = 21402768 bytes -BLAKE2s (rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz) = a0ade8d56901d1658cc6080a63cc41b7c04675aa2ace95d421e7902015c55e73 -SHA512 (rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz) = 27995922b119d96df8bd52f186a6d5ed5b217012d7c7afc95e888414d1049c8446bee0585b83ecd063851496f5e5632d7975f2526c5e13bc07fa2a0ca1a5adf2 -Size (rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz) = 38006875 bytes -BLAKE2s (rust-std-1.79.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = 262006ae1f3d8a962e98e3338946aab656216fefb48dc92e3d727e4d53fb3ab4 -SHA512 (rust-std-1.79.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = 73084c0b1266964a33175a751219824110be77d705e976069b94d5daca072322c84cf028c9f6861d09990bd4164dd20a3d3e452a75523a2a44e2f7a1502a308b -Size (rust-std-1.79.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = 22236560 bytes -BLAKE2s (rust-std-1.79.0-i586-unknown-netbsd.tar.xz) = 88024c08e8da6134bf68b402eea1eb2ebb17d62ff89db778863f517b78bcae6b -SHA512 (rust-std-1.79.0-i586-unknown-netbsd.tar.xz) = 98d963da79b9959e63a9c240f2c8f7de34bf9901f33f5b2c518229e2d3b31c183d1b78fb04cc2e5b44b6c1d014195adda5fe7554dc5075e284509d0d88e4ea7b -Size (rust-std-1.79.0-i586-unknown-netbsd.tar.xz) = 23206832 bytes -BLAKE2s (rust-std-1.79.0-i686-unknown-linux-gnu.tar.gz) = ce1a9636585f59c3e688866f26f81bbf832092b4f721a3b272a730184856214f -SHA512 (rust-std-1.79.0-i686-unknown-linux-gnu.tar.gz) = 2f449a6799a8df565fea267025a499a9191fc9de8a59d8400e42afc4fe7974f522bd6c236e2fb4f31828e542e4f3def2b48ddd5b44ff2574ea2c8ac16cd4ef35 -Size (rust-std-1.79.0-i686-unknown-linux-gnu.tar.gz) = 39691484 bytes -BLAKE2s (rust-std-1.79.0-powerpc-unknown-netbsd.tar.xz) = 2dee1e3ea6419c883f86b11e54b32d6162bab9657b820f2da6be16103af7dacd -SHA512 (rust-std-1.79.0-powerpc-unknown-netbsd.tar.xz) = 71178391f0d2c75b8edebc2106c63e760192bd1746002e8cce04802936ae678b0f650aa76e5d421631fca28abc3ddf6b378bc72ffecb2d87a7efed824062e1d0 -Size (rust-std-1.79.0-powerpc-unknown-netbsd.tar.xz) = 21572064 bytes -BLAKE2s (rust-std-1.79.0-riscv64gc-unknown-netbsd.tar.xz) = 1d84d2509de80175b71e4c47fc98aa6873bd2fd7c36e0e5cdbf4c0d250d897f5 -SHA512 (rust-std-1.79.0-riscv64gc-unknown-netbsd.tar.xz) = 2ab1b358b028023facd1f948287a65ba0855aaf315ba504e09fb178093ae8119407188012a0ebbf5b2282679b0a0db24011ef66f82046319cc918c1bbe05c9a3 -Size (rust-std-1.79.0-riscv64gc-unknown-netbsd.tar.xz) = 21517900 bytes -BLAKE2s (rust-std-1.79.0-sparc64-unknown-netbsd.tar.xz) = 53210e31662e2c379a875b3e979b36e86bfc4a2ac5d51afbe59e274e13433d7a -SHA512 (rust-std-1.79.0-sparc64-unknown-netbsd.tar.xz) = 657f9b409c40c2b59ff7638b67c2e67af35ff789dfd60aab3e0b4d57874b56a6559320869528e9e7683e3abde005328358d5df908004c375ab8120c7a016887e -Size (rust-std-1.79.0-sparc64-unknown-netbsd.tar.xz) = 21195912 bytes -BLAKE2s (rust-std-1.79.0-x86_64-apple-darwin.tar.gz) = 795f2e1d819d72caa457261a4705067c3dd0d2c1f62d80d9d470015c88a3d6c4 -SHA512 (rust-std-1.79.0-x86_64-apple-darwin.tar.gz) = 213cac375caff4c6e4958b547ea8bddc65ffacba3b9b6a9f9a785605d9f6215ac6e765b319d8761dd162b1fc6dccdc81ed17f36611ccb549f4d0de132c8acfbb -Size (rust-std-1.79.0-x86_64-apple-darwin.tar.gz) = 41816064 bytes -BLAKE2s (rust-std-1.79.0-x86_64-unknown-freebsd.tar.gz) = aaecc0acec6b054b6a04222e86717cf0ce7bcf1521dfdad86de344578b2feb56 -SHA512 (rust-std-1.79.0-x86_64-unknown-freebsd.tar.gz) = 4a18c59f59b3be8d4e8507add54be24e5c2512f92d0ea6df94951de2113a8e884b19aa45566a96c7bd3f7a6b21cffe4105d6206148bc4f63cf2e9b3ba18147d5 -Size (rust-std-1.79.0-x86_64-unknown-freebsd.tar.gz) = 42728681 bytes -BLAKE2s (rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = c7c609fdc4cbc2b2b809fa38057c8b4e0e2fee4b27146f22c943e34d8df20c13 -SHA512 (rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = aa836c267341c5b902a010e330931778d948c0dc202184fd95e5dc98efbfa9e1e0e3a79a5e0fc3bf1e22cf7862425c72e8ae853783fa5efd962ce8d6f5badffb -Size (rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.gz) = 45178826 bytes -BLAKE2s (rust-std-1.79.0-x86_64-unknown-netbsd.tar.xz) = 539c691f46329683c01e37a065fff061c6fbc7c6aedc14bccff579844003c3b6 -SHA512 (rust-std-1.79.0-x86_64-unknown-netbsd.tar.xz) = f8f82e8c9a5f49ac60db401178777b7e7a12486c4a21ea9b555af4a9ea765b9122803d3e13eb0f16ce94790d1a92344f0bc75910ff39ffcb2d8559e9c00d4c1c -Size (rust-std-1.79.0-x86_64-unknown-netbsd.tar.xz) = 25697328 bytes +BLAKE2s (rust-1.80.1-arm-unknown-linux-gnueabihf.tar.gz) = 90e2c0e90cb8378fcb8e5e3e1ff61851798c1f038917102a389829a106906af2 +SHA512 (rust-1.80.1-arm-unknown-linux-gnueabihf.tar.gz) = 6be5cf7c9111481d709c2214b5b97f9bc291f517f45d1010faa8f8e5031bbb6bda00638e8e4a9352a3ccc053c312d3c7a1ad5f83f556c373acd7cf5db0708c1d +Size (rust-1.80.1-arm-unknown-linux-gnueabihf.tar.gz) = 367696583 bytes +BLAKE2s (rust-1.80.1-armv6-unknown-netbsd-eabihf.tar.xz) = f5495b2f107774e78536e4caf2e2c56e3e680cc701a1d8230d37065ee74046a2 +SHA512 (rust-1.80.1-armv6-unknown-netbsd-eabihf.tar.xz) = a894f9416e38002bb2843379fe0fe7316b3da39f8dd50025f0b3ec9627721d0fbca642f3acb7b46cd76f1b1a803aedd5beb9d1204544384cdacb19a7c01fdb4f +Size (rust-1.80.1-armv6-unknown-netbsd-eabihf.tar.xz) = 148976808 bytes +BLAKE2s (rust-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz) = 20e55694f8ccc671310d4a28452baf61061647b18e2ca5c3e36ed39e14a9ab3c +SHA512 (rust-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz) = f3bda80f39ca5da2b2eb0df807717009c576440e9036d93a234ef8b00e88dc11122025c9e8c9f24656fc79f9f7afbb55504f024c87f1c7b6a28bf0e7cbab296e +Size (rust-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz) = 356035939 bytes +BLAKE2s (rust-1.80.1-armv7-unknown-netbsd-eabihf.tar.xz) = 4e5c207135ffb8e8108da75f2a3811505aaa931664d7003d8beac9494dc04677 +SHA512 (rust-1.80.1-armv7-unknown-netbsd-eabihf.tar.xz) = 812555c8b5527e1081c02b3f02e11c4e45d8822eb12f8525378f99f27cc7170e50d41bcd97bd57898068fa713ed8995d33a3b890f80b06fbfdb6d517122f70af +Size (rust-1.80.1-armv7-unknown-netbsd-eabihf.tar.xz) = 150699540 bytes +BLAKE2s (rust-1.80.1-i586-unknown-netbsd.tar.xz) = f6946d2c2ad63008d710eb6dab89140e19512d52e277ab18bb8ca014a77afe71 +SHA512 (rust-1.80.1-i586-unknown-netbsd.tar.xz) = 0e91a871bbf8c319a50487216f21315f626ba4e01906fd11d8b8a6c340eebad40ea22f4fd25adf61323faec63c38fe499b6cec54244cdec56a8bffca3e087a4e +Size (rust-1.80.1-i586-unknown-netbsd.tar.xz) = 188463156 bytes +BLAKE2s (rust-1.80.1-i686-unknown-linux-gnu.tar.gz) = 786d74439668086d839c89207ba168154fc0cd39b2b8a03c4e97fd8b6d070f07 +SHA512 (rust-1.80.1-i686-unknown-linux-gnu.tar.gz) = 3ec4219c42001144149db0557c45de85be9977343641431bf37d1c440b5a9095b496a5b74a2dc0da326cf91020cad3abfe8df6c0b5444cc8c9354c03002651c0 +Size (rust-1.80.1-i686-unknown-linux-gnu.tar.gz) = 434569276 bytes +BLAKE2s (rust-1.80.1-powerpc-unknown-netbsd.tar.xz) = 9f7c94a22d6248740258fd4336e890da58c71c6b8cb06544f6d24f5c36f170ad +SHA512 (rust-1.80.1-powerpc-unknown-netbsd.tar.xz) = 2a37b85bf3b5373819552e0844d0e272e2386030c4b05844e4b87147bf53df25072dff21e8d3fab5562033dd91b582ee2eb55f4d1727d1654e86c16c347f86ad +Size (rust-1.80.1-powerpc-unknown-netbsd.tar.xz) = 200660060 bytes +BLAKE2s (rust-1.80.1-riscv64gc-unknown-netbsd.tar.xz) = 6145de62149f041d7bc6632e49e4c0258ce47d30187054950dabfa85d58d2daa +SHA512 (rust-1.80.1-riscv64gc-unknown-netbsd.tar.xz) = ae56ce7326e7a40c543b0fc23f45fb4e70df2693e69f708658744de5f1ca6113f61b6600859cfeede4fb79f0f8c8bb61b4f13d0bf914e01bba4a547a0bad1a8d +Size (rust-1.80.1-riscv64gc-unknown-netbsd.tar.xz) = 189557556 bytes +BLAKE2s (rust-1.80.1-sparc64-unknown-netbsd.tar.xz) = 3cfb6f84dc94f0ecab5a5cbdb8e6bcb4b99fadaa67a4d38c05db2ac1b081a9b7 +SHA512 (rust-1.80.1-sparc64-unknown-netbsd.tar.xz) = 1679d43fa17d07f0f76218e91a538f5e2c4eb60917894f0d6bba3fa99a046dc2f9d82e293c4d2c2886e52f75e73d6b8f3bee4481c59d2d6d8f52f4f785bf864a +Size (rust-1.80.1-sparc64-unknown-netbsd.tar.xz) = 168170056 bytes +BLAKE2s (rust-1.80.1-x86_64-apple-darwin.tar.gz) = 2c64867f560ea4a5403ee68523c384d6717d281b36ebce06e73a59c01200daf7 +SHA512 (rust-1.80.1-x86_64-apple-darwin.tar.gz) = 8bcbe05679c9257301a97b6220c607bdc89bfcba6458ceddec398152e9081b5cd08a13c1fb99755da177adae4aeee8b2017a963d1fe83e82bc11bf94231ead5e +Size (rust-1.80.1-x86_64-apple-darwin.tar.gz) = 342436964 bytes +BLAKE2s (rust-1.80.1-x86_64-unknown-freebsd.tar.gz) = 4cba92e989fb6f05cbc3521e959d77d7cc50be1046bd268e7bbc1dce67c632a2 +SHA512 (rust-1.80.1-x86_64-unknown-freebsd.tar.gz) = efcafadb9b78bfe9e779047186a6f5232a84eabbf7f7db56582f76c8d76285465eafc30e881328e06555da3531b9e879ddd982d1080930f5528c7c491e33d431 +Size (rust-1.80.1-x86_64-unknown-freebsd.tar.gz) = 325362067 bytes +BLAKE2s (rust-1.80.1-x86_64-unknown-illumos.tar.gz) = 19a7088bf5df1ea978f34c00d59ca6a6997d1757daf0ab290241291aa7bd2cc7 +SHA512 (rust-1.80.1-x86_64-unknown-illumos.tar.gz) = b39e2aa68d3c9b8a241c3b0c2a49c5377e092487c116930ce06834cddba6270e66c494fdb8a4928096f654724a592520c6f7fb4f45da4a22b8fb3058ed74b721 +Size (rust-1.80.1-x86_64-unknown-illumos.tar.gz) = 218858660 bytes +BLAKE2s (rust-1.80.1-x86_64-unknown-linux-gnu.tar.gz) = df8878890b9337a0d09b29f31748b146cc02f6d7d7006b1c8f1393ecbcd220ef +SHA512 (rust-1.80.1-x86_64-unknown-linux-gnu.tar.gz) = 222e19b986f5e2ff3607c41b15383db604fcf11c4eae8f129f73b4cfd1a5954f13e64f3a4512577af21d7ed2bb623e7f8b8de5fab0356d4544cd1552b8da59a0 +Size (rust-1.80.1-x86_64-unknown-linux-gnu.tar.gz) = 335779502 bytes +BLAKE2s (rust-1.80.1-x86_64-unknown-netbsd.tar.xz) = 2532a3d67b46958b040c86fc4cd8062d71b6ac16c9929f4fc7127acd87e3e721 +SHA512 (rust-1.80.1-x86_64-unknown-netbsd.tar.xz) = 84399dd75bb4082bd00bed94eee61d71fcf4203881f38dc593123fd80c3b4bbe1b7ddabb41dca640aa4a7f9185d31ade5e35f5111b49e866b11fad4ea9a08562 +Size (rust-1.80.1-x86_64-unknown-netbsd.tar.xz) = 164745500 bytes +BLAKE2s (rust-std-1.80.1-aarch64-apple-darwin.tar.gz) = d5260b3da6ab14e7755ed3aaa939ff7b6c2438467330ba05928a78cd731a085f +SHA512 (rust-std-1.80.1-aarch64-apple-darwin.tar.gz) = 8fe613dee6f7832e0a07e7bb29faf89b04687fafe080034570571fba617f0cab456f3b8d509a8edb1b52da6288d17ebb8f87a1fed3c34b4b9d3968683e474889 +Size (rust-std-1.80.1-aarch64-apple-darwin.tar.gz) = 40245667 bytes +BLAKE2s (rust-std-1.80.1-aarch64-unknown-linux-gnu.tar.gz) = 95531df139d493b14a0270368ec0c805f031a31e3875cb832ac3f5254f5fd1e5 +SHA512 (rust-std-1.80.1-aarch64-unknown-linux-gnu.tar.gz) = a442bd396e533c6e065838fdbcf264299319affce453ce621c9cc192f5e9968c8fb38f8add9b9ef18c2038a429565c83e009288ca97566c2bb9f5fcac67c02e8 +Size (rust-std-1.80.1-aarch64-unknown-linux-gnu.tar.gz) = 64977385 bytes +BLAKE2s (rust-std-1.80.1-aarch64-unknown-netbsd.tar.xz) = a91cba6c3b9da40f3c81d69aebadf8eed44bcb0e5eff912a4528194c690489ea +SHA512 (rust-std-1.80.1-aarch64-unknown-netbsd.tar.xz) = 4350657f4819cd335cdbe1f809ae79433e435bf69ab7a30fe33b99355376c584d6b7ada95a9b0a288c024ff0ee6629ea855a40c17fb9a18f6db1b4e6cea62725 +Size (rust-std-1.80.1-aarch64-unknown-netbsd.tar.xz) = 22945928 bytes BLAKE2s (rust-std-1.80.1-aarch64_be-unknown-netbsd.tar.xz) = 4c51df88bebd86fcbcb9a03a44979a9935ae68415c8ae8771b246a1127d2d6bd SHA512 (rust-std-1.80.1-aarch64_be-unknown-netbsd.tar.xz) = f047240b7fb7663571a3e3c9c5ad7a9c1109ca212d5a3492d7edde4db8028437b1d102f94f24c817684bd62a3f8f98ad834b593acbae68719e9aab307762b14b Size (rust-std-1.80.1-aarch64_be-unknown-netbsd.tar.xz) = 21406608 bytes -BLAKE2s (rustc-1.80.1-src.tar.gz) = 691e52751254798b20cabb79f267f6ebac8660cc94536693726ac5d8095c2099 -SHA512 (rustc-1.80.1-src.tar.gz) = e33bc028f44742b4eab43ca5068123d5afa458594366f49ac5ac3ba3748a1852fe3e74ced360a66dcbac1b59f5a6b0ce7bdf53f8fc6e838f6b27be0e89c52f51 -Size (rustc-1.80.1-src.tar.gz) = 377927214 bytes -SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f5336828d70f9fc684ea871a6869138ac7a18b4f +BLAKE2s (rust-std-1.80.1-arm-unknown-linux-gnueabihf.tar.gz) = 249b6bc6d8bb50c9bb59e7a17f74e1e115d4b2dc8a1659abc236dd862526cfda +SHA512 (rust-std-1.80.1-arm-unknown-linux-gnueabihf.tar.gz) = 7bf9ee7a770da811db87bf46088664451e057150365015239a11383da80817959d7f1e1e44bdb610b4c0980d1d5782c5b63649f87af2e383f2872fb23d7e8cdc +Size (rust-std-1.80.1-arm-unknown-linux-gnueabihf.tar.gz) = 36851387 bytes +BLAKE2s (rust-std-1.80.1-armv6-unknown-netbsd-eabihf.tar.xz) = ba11e4dd5f24ceaa308ac9e2be44f4c111c27198ff1036a60f0294c166af862f +SHA512 (rust-std-1.80.1-armv6-unknown-netbsd-eabihf.tar.xz) = 5c5668dc346ec993567a8eb0897211609e0bbab6a0da1049d0a31dd8a239d0eb419f5d50fcad5a9d8b5acef9e472557889325ae57be38ced06b52ce3b8cc2e04 +Size (rust-std-1.80.1-armv6-unknown-netbsd-eabihf.tar.xz) = 21468568 bytes +BLAKE2s (rust-std-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz) = 7c15dc556d80224e120f9b8e51fb40ae65e7bb044faef41a0ba39ecdb0625a6b +SHA512 (rust-std-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz) = 467ae54fe1876ebdb8cbb68388b3e5e3001778739dbd2e54dc100aa0d4b96cdea2c83835ed051fb61f0faf06b512d587fedddcbcc4771382143e34547a76f2bc +Size (rust-std-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz) = 38375461 bytes +BLAKE2s (rust-std-1.80.1-armv7-unknown-netbsd-eabihf.tar.xz) = 6e978303a99f503fa2473a421339ea2c036a72ffc7f0776c8aa95b501bf2947e +SHA512 (rust-std-1.80.1-armv7-unknown-netbsd-eabihf.tar.xz) = 3337d76f632e402b688d4b7a002b56558d5d9cc818460f447084c6872b6c4d567727dd750f7a94c29be6335fab993842c577a2b72f7c98cb05e4a270cd4c2ded +Size (rust-std-1.80.1-armv7-unknown-netbsd-eabihf.tar.xz) = 22317232 bytes +BLAKE2s (rust-std-1.80.1-i586-unknown-netbsd.tar.xz) = d943d3c7fd04d3a3ee066a08ce957450ce372c76f482fbf62d538c9c64ca4681 +SHA512 (rust-std-1.80.1-i586-unknown-netbsd.tar.xz) = e9e3f3cf160439db47e316ca34c7c8a66f64eadd9da78fa3bcb4a3ac0eb5a0029d9907e7224d5f5db4bb8c176f80ae42ca7efbdca64c90aa0c7b7295c5080e8b +Size (rust-std-1.80.1-i586-unknown-netbsd.tar.xz) = 23342476 bytes +BLAKE2s (rust-std-1.80.1-i686-unknown-linux-gnu.tar.gz) = d688d3845d36dd772e5d36d238ddc64ecbb37011f62c3021ed6594f235e7be5c +SHA512 (rust-std-1.80.1-i686-unknown-linux-gnu.tar.gz) = 184c3e04847203b87fe6d7fa6520d6625ae47a982c7dc189b807f9c77049b24d4cd310802e7622790a949608e8580cd53ae186dd00de24a9e9eeec7e3e5f4e60 +Size (rust-std-1.80.1-i686-unknown-linux-gnu.tar.gz) = 39905818 bytes +BLAKE2s (rust-std-1.80.1-powerpc-unknown-netbsd.tar.xz) = 16eed40ebcc9350681d866f2fae2243ad930cc96ac4aa1461ac995a98884833d +SHA512 (rust-std-1.80.1-powerpc-unknown-netbsd.tar.xz) = 164fb5b3980b2ac54b13ef9a602d878446c128824bd12e9c6fb69e68d70c181080a8e5186e85a0a914c5e303e7db3d733cb74f317586fe024f7814a7ff87abaa +Size (rust-std-1.80.1-powerpc-unknown-netbsd.tar.xz) = 21684868 bytes +BLAKE2s (rust-std-1.80.1-riscv64gc-unknown-netbsd.tar.xz) = b525a3ae0e2fd1f34d003a029d6f1c441206c5a8c824dfc52e2f8f98e8491b09 +SHA512 (rust-std-1.80.1-riscv64gc-unknown-netbsd.tar.xz) = 2aedbbac41224ab94cf3ff0e300b71c736bc1f7060ea89b46b39aae2f79418edc01df0c562287ba097b3c87afda048f6567a4912c6f8e545a0f76a073fde0763 +Size (rust-std-1.80.1-riscv64gc-unknown-netbsd.tar.xz) = 21665936 bytes +BLAKE2s (rust-std-1.80.1-sparc64-unknown-netbsd.tar.xz) = db28bb79759fc8ccf77f87d9e1980ee87783cbd4b8a5a38604331c7403dc10e9 +SHA512 (rust-std-1.80.1-sparc64-unknown-netbsd.tar.xz) = 93fa8f7685aac422c4322949281fae710c26a07c25a85f502ad1773720bb38261c4bc16a566aacfa728717c540ccbd96f529d46277711e775781eaa12a530b66 +Size (rust-std-1.80.1-sparc64-unknown-netbsd.tar.xz) = 21378904 bytes +BLAKE2s (rust-std-1.80.1-x86_64-apple-darwin.tar.gz) = 3344b201db06a760b6579790c40d03e06bc7b673710f42b82400716c99db7512 +SHA512 (rust-std-1.80.1-x86_64-apple-darwin.tar.gz) = 8bf682eb601e0e3243f95946d3b6aa3f31ee448bf68db7543078b67a1fc812d6010ee437ec540b0bfcbe3923c0c09cad3212886910250413ab45d5da5aa2915d +Size (rust-std-1.80.1-x86_64-apple-darwin.tar.gz) = 41992918 bytes +BLAKE2s (rust-std-1.80.1-x86_64-unknown-freebsd.tar.gz) = 064fa3f008912f0ea56f4e41dbadeb5e4d64d485308e3744451025ebedc496b5 +SHA512 (rust-std-1.80.1-x86_64-unknown-freebsd.tar.gz) = 46c703212b50b6268e9dfea3a4fd9286aaa48966ce6d971e5104179d235e0f3d0c463fe61849ee8eed2cfa7c6986679c60c1a04e362daf66f15ad09ca1352016 +Size (rust-std-1.80.1-x86_64-unknown-freebsd.tar.gz) = 42919193 bytes +BLAKE2s (rust-std-1.80.1-x86_64-unknown-linux-gnu.tar.gz) = 0e33e69fdb2bcdc70629efa3283585ee93fed759daac4f6a6fe8c8a9f2dfbbcd +SHA512 (rust-std-1.80.1-x86_64-unknown-linux-gnu.tar.gz) = 12b99233c0914826c1fd9b0536a56f26011d7ffa12e681ec073e268976a5b25d6db79f8523562c16874c66ae6e8731e9c91b06a3d573f673a7c67ac92b2875ba +Size (rust-std-1.80.1-x86_64-unknown-linux-gnu.tar.gz) = 45353895 bytes +BLAKE2s (rust-std-1.80.1-x86_64-unknown-netbsd.tar.xz) = 3856efad0d2163e5d65f96c57dd625336fa129a295b86f1808f843b73263ad8b +SHA512 (rust-std-1.80.1-x86_64-unknown-netbsd.tar.xz) = 4a2effa77f4916516d6667ffe2fe0ef3ce0799d2e90216efe511be983ff43d1fc3d16d11f010365e9aa2b3756b4ed08b7a59df37de42c1b5824e791238751ca0 +Size (rust-std-1.80.1-x86_64-unknown-netbsd.tar.xz) = 25793560 bytes +BLAKE2s (rustc-1.81.0-src.tar.gz) = 5b1c5e436800fbd061df9aee740c8bf73d17654d75016eb84a7e3661e9322957 +SHA512 (rustc-1.81.0-src.tar.gz) = ea1f894b56085ab95ff1bdf9ef20e0756c134be8217c8e8934de44651f7cac6339829a198f8770d97050da79711527ff80fae184038fdb2962b741d0f99b71a1 +Size (rustc-1.81.0-src.tar.gz) = 434198596 bytes +SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a11f894d87516da6a8e3faaa4425c8212ff5899f SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8 SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7d910631f49acf2c33fdd191fd3e0f261efae234 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00 @@ -117,13 +117,16 @@ SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs) SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = e97b7978cc525db7eadf967d51f4818a3c145754 SHA1 (patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs) = 7deeb7d1d3306e96891dec144ac90398b88c6ad4 SHA1 (patch-compiler_rustc__target_src_spec_targets_sparc64__unknown__netbsd.rs) = 847022a9c02d277f39e2c842f23a9ed401bc5534 +SHA1 (patch-config.example.toml) = 520ad7a26249780ae79a5dc1d2b534a8c6aef0a5 SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee76da9bb768f5b3d9 SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952 SHA1 (patch-library_std_src_sys_pal_unix_mod.rs) = bfc59ae4568547e3ed71c8b31ba5b5b5363d5d40 -SHA1 (patch-src_bootstrap_bootstrap.py) = 5cd73003292c935ce0e405edd132180233a04857 -SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = 4696304623232acd419ad15597f539a10a014271 +SHA1 (patch-src_bootstrap_bootstrap.py) = 6f1d3068da49f19c3e092230ba1c7d99af628d3a +SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83 +SHA1 (patch-src_bootstrap_src_core_build__steps_dist.rs) = eb228d43e1cf21ec646b516b8c67c648c7183f8a SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = cc6558df42c9c9ac28fdb2ff180bdaa7f22ce816 SHA1 (patch-src_bootstrap_src_core_builder.rs) = e3fd19e0a18f1e79e287c85035ea431b98d91d9a +SHA1 (patch-src_bootstrap_src_core_config_config.rs) = fa9d93602693bce064aa155ad0a204b176b47d99 SHA1 (patch-src_bootstrap_src_lib.rs) = d29bc3c0b335d5e788eecbb02fc08966beef0fb1 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12 @@ -131,7 +134,7 @@ SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 39d76e6659143d154ae690ac70781b698a2023d8 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = e1af7fde97416e0a269ee34efd37f4f47fcf7a95 -SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906 +SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 84dfc091a152b83938e8706917d692a329b70393 SHA1 (patch-src_tools_rust-installer_install-template.sh) = 6984546c34a2e4d55a6dbe59baa0d4958184e0b7 SHA1 (patch-tools_rust-analyzer_lib_line-index-src_lib.rs) = 4ed527174447ee23fa81dd6840e18b9949d5a273 SHA1 (patch-vendor_aho-corasick-1.1.2_src_packed_teddy_builder.rs) = c76abf55d641cebb70935ebeebe6cdd6f3f09463 @@ -139,10 +142,6 @@ SHA1 (patch-vendor_aho-corasick-1.1.2_src_packed_vector.rs) = dddc3ea2f407ce61c8 SHA1 (patch-vendor_bytecount-0.6.8_src_lib.rs) = d7610f2ae957d085a465f8c75549e5a11586a8b0 SHA1 (patch-vendor_cc-1.0.73_src_lib.rs) = 690b3feaa619050512254d7c18fd4f51da98e279 SHA1 (patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs) = d4d9288cb199af9bc7e321fbd2b42860aed954ec -SHA1 (patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 0895df54084281263b9dae67e57f68168fb66bd4 -SHA1 (patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 8699853de4225d4e5953d6bf17b59bc463fa7b5d -SHA1 (patch-vendor_libc-0.2.153_src_unix_solarish_mod.rs) = dfa5ec7f1c69e3ca4ff8574dcd248bdce6c82f0b -SHA1 (patch-vendor_libc-0.2.154_src_unix_solarish_mod.rs) = e8f72fb13df8b9e111d296bcf3597343496219b5 SHA1 (patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs) = 97505b88875aa80fa2b5589b6090237c3786e143 SHA1 (patch-vendor_memchr-2.7.1_src_arch_aarch64_memchr.rs) = 22b2cd0e629f66b81456aed62b4925070635a62b SHA1 (patch-vendor_memchr-2.7.1_src_arch_aarch64_mod.rs) = 46473abc95a7884ee6163d30156b67d8951c0c30 @@ -154,6 +153,11 @@ SHA1 (patch-vendor_memchr-2.7.2_src_arch_aarch64_mod.rs) = fa96a8e6546e5603a8a22 SHA1 (patch-vendor_memchr-2.7.2_src_memchr.rs) = 609dc522e5c774226d7b21391d5354f8382fe578 SHA1 (patch-vendor_memchr-2.7.2_src_memmem_searcher.rs) = 0bdafac65abac9ee719c64d2c53125edbb5edd20 SHA1 (patch-vendor_memchr-2.7.2_src_vector.rs) = eb716f077a311fb347139b0e40237f3ed31cf2d8 +SHA1 (patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs) = 3e17e9f068afe5e812d10bf57fd3f6d4c21baf0b +SHA1 (patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs) = 24bbd69c8b571e5652d5306989b6598b58ec1966 +SHA1 (patch-vendor_memchr-2.7.4_src_memchr.rs) = 4c2f4fa4911f38acd3b36c311abd14d3c9751672 +SHA1 (patch-vendor_memchr-2.7.4_src_memmem_searcher.rs) = a5038873015004ab0c8769dda84edc16a9c55f24 +SHA1 (patch-vendor_memchr-2.7.4_src_vector.rs) = 50a901d061cf58a745b0c387a1c45ff2f0c54e89 SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf) = ac2963bca8d1dc4e196693d9f5a264f38355314a SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs) = c87435bef2899b30b5cdb1b525193489988b2476 SHA1 (patch-vendor_openssl-sys-0.9.102_build_find__normal.rs) = 2cf1432ed2be79677d41f267f9a08ff3082e9cbc diff --git a/lang/rust/do-cross.mk b/lang/rust/do-cross.mk index 49457b5a0299..f1491626ab54 100644 --- a/lang/rust/do-cross.mk +++ b/lang/rust/do-cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: do-cross.mk,v 1.12 2024/10/13 19:04:39 he Exp $ +# $NetBSD: do-cross.mk,v 1.13 2024/11/24 16:13:42 he Exp $ # Do all the NetBSD cross builds # Collect the bootstrap kits in dist/ diff --git a/lang/rust/options.mk b/lang/rust/options.mk index e5ac975ec0b8..2fe51498b3f8 100644 --- a/lang/rust/options.mk +++ b/lang/rust/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.41 2024/10/13 19:04:39 he Exp $ +# $NetBSD: options.mk,v 1.42 2024/11/24 16:13:43 he Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rust PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs @@ -29,18 +29,18 @@ PKG_SUGGESTED_OPTIONS+= rust-cargo-static .include "../../mk/bsd.options.mk" -# # NetBSD/sparc64 when using the internal LLVM needs # to not use gcc 10.4 or 10.5 (as found in 10.0_BETA or 10.0), ref. # https://github.com/rust-lang/rust/issues/117231 -# (however, gcc from 9.x produces a working LLVM). +# (however, gcc from 9.x produces a working LLVM, go figure). .if ${MACHINE_PLATFORM:MNetBSD-10.*-sparc64} . if !empty(PKG_OPTIONS:Mrust-internal-llvm) -## Require GCC 12 (from pkgsrc) to correctly build the embedded LLVM (17.x). +# Require GCC 12 (from pkgsrc) to correctly build the embedded LLVM (18.x). GCC_REQD+= 12 . endif .endif +# # Use the internal copy of LLVM or the external one? # .if empty(PKG_OPTIONS:Mrust-internal-llvm) @@ -49,6 +49,10 @@ GCC_REQD+= 12 CONFIGURE_ARGS+= --enable-llvm-link-shared CONFIGURE_ARGS+= --llvm-libunwind=system CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} +# Also turn off build of the internal LLD, as the external LLVM +# may be older (e.g. 17) than the internal LLD (now 18.x), ref. +# https://github.com/rust-lang/rust/issues/131291 +CONFIGURE_ARGS+= --set rust.lld=false .endif # diff --git a/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs index b315aa915369..1d8816b2ac77 100644 --- a/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs +++ b/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs @@ -1,27 +1,27 @@ -$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.17 2024/07/27 02:35:24 tnn Exp $ +$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.18 2024/11/24 16:13:43 he Exp $ Do not use @rpath on Darwin. Find external libunwind on Linux. --- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2006-07-24 01:21:28.000000000 +0000 +++ compiler/rustc_codegen_ssa/src/back/linker.rs -@@ -312,7 +312,7 @@ impl<'a> GccLinker<'a> { +@@ -402,7 +402,7 @@ impl<'a> GccLinker<'a> { // principled solution at some point to force the compiler to pass // the right `-Wl,-install_name` with an `@rpath` in it. if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name { - let mut rpath = OsString::from("@rpath/"); + let mut rpath = OsString::from("@PREFIX@/lib/"); rpath.push(out_filename.file_name().unwrap()); - self.linker_args(&[OsString::from("-install_name"), rpath]); + self.link_arg("-install_name").link_arg(rpath); } -@@ -462,6 +462,10 @@ impl<'a> Linker for GccLinker<'a> { - self.linker_arg("--as-needed"); - } - } +@@ -880,6 +880,10 @@ impl<'a> Linker for MsvcLinker<'a> { + + fn link_dylib_by_name(&mut self, name: &str, verbatim: bool, _as_needed: bool) { + self.link_arg(format!("{}{}", name, if verbatim { "" } else { ".lib" })); + if self.sess.target.os.contains("linux") && name == "unwind" { -+ self.linker_arg("-rpath,@PREFIX@/lib"); -+ self.linker_arg("-L@PREFIX@/lib"); ++ self.link_arg("-rpath,@PREFIX@/lib"); ++ self.link_arg("-L@PREFIX@/lib"); + } } - fn link_framework_by_name(&mut self, name: &str, _verbatim: bool, as_needed: bool) { + fn link_dylib_by_path(&mut self, path: &Path, _as_needed: bool) { diff --git a/lang/rust/patches/patch-config.example.toml b/lang/rust/patches/patch-config.example.toml new file mode 100644 index 000000000000..0b64a5458dbc --- /dev/null +++ b/lang/rust/patches/patch-config.example.toml @@ -0,0 +1,14 @@ +$NetBSD: patch-config.example.toml,v 1.1 2024/11/24 16:13:43 he Exp $ + +Backport https://github.com/rust-lang/rust/pull/130110/ +"make dist vendoring configurable" + +--- config.example.toml.orig 2024-09-22 17:59:03.580913638 +0000 ++++ config.example.toml +@@ -918,3 +918,6 @@ + # Copy the linker, DLLs, and various libraries from MinGW into the Rust toolchain. + # Only applies when the host or target is pc-windows-gnu. + #include-mingw-linker = true ++ ++# Whether to vendor dependencies for the dist tarball. ++#vendor = if "is a tarball source" || "is a git repository" { true } else { false } diff --git a/lang/rust/patches/patch-src_bootstrap_bootstrap.py b/lang/rust/patches/patch-src_bootstrap_bootstrap.py index b4d69452da99..3166c52a7f37 100644 --- a/lang/rust/patches/patch-src_bootstrap_bootstrap.py +++ b/lang/rust/patches/patch-src_bootstrap_bootstrap.py @@ -1,4 +1,4 @@ -$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.23 2024/04/18 09:29:42 pin Exp $ +$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.24 2024/11/24 16:13:43 he Exp $ Use `uname -p` on NetBSD, as that is reliable and sensible there. Handle earmv[67]hf for NetBSD. @@ -6,7 +6,7 @@ --- src/bootstrap/bootstrap.py.orig 2023-07-12 03:32:40.000000000 +0000 +++ src/bootstrap/bootstrap.py -@@ -271,6 +271,11 @@ def default_build_triple(verbose): +@@ -270,6 +270,11 @@ def default_build_triple(verbose): 'GNU': 'unknown-hurd', } @@ -18,7 +18,7 @@ # Consider the direct transformation first and then the special cases if kernel in kerneltype_mapper: kernel = kerneltype_mapper[kernel] -@@ -374,10 +379,16 @@ def default_build_triple(verbose): +@@ -373,10 +378,16 @@ def default_build_triple(verbose): kernel = 'linux-androideabi' else: kernel += 'eabihf' @@ -36,12 +36,11 @@ else: kernel += 'eabihf' elif cputype == 'mips': -@@ -735,7 +746,7 @@ class RustBuild(object): +@@ -734,6 +745,7 @@ class RustBuild(object): + + patchelf = "{}/bin/patchelf".format(nix_deps_dir) rpath_entries = [ - # Relative default, all binary and dynamic libraries we ship - # appear to have this (even when `../lib` is redundant). -- "$ORIGIN/../lib", -+ "@PREFIX@/lib", ++ "@PREFIX@/lib", os.path.join(os.path.realpath(nix_deps_dir), "lib") ] - patchelf_args = ["--set-rpath", ":".join(rpath_entries)] + patchelf_args = ["--add-rpath", ":".join(rpath_entries)] diff --git a/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_compile.rs b/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_compile.rs index 485349b7ec92..aad20d979478 100644 --- a/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_compile.rs +++ b/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_compile.rs @@ -1,15 +1,15 @@ -$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.2 2024/04/18 09:29:42 pin Exp $ +$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.3 2024/11/24 16:13:43 he Exp $ On Darwin, do not use @rpath for internal libraries. --- src/bootstrap/src/core/build_steps/compile.rs.orig 2024-01-06 20:42:20.028206400 +0000 +++ src/bootstrap/src/core/build_steps/compile.rs -@@ -626,7 +626,7 @@ fn copy_sanitizers( +@@ -695,7 +695,7 @@ fn copy_sanitizers( || target == "x86_64-apple-ios" { // Update the library’s install name to reflect that it has been renamed. -- apple_darwin_update_library_name(&dst, &format!("@rpath/{}", &runtime.name)); -+ apple_darwin_update_library_name(&dst, &format!("@PREFIX@/lib/{}", &runtime.name)); +- apple_darwin_update_library_name(builder, &dst, &format!("@rpath/{}", runtime.name)); ++ apple_darwin_update_library_name(builder, &dst, &format!("@PREFIX@/lib/{}", runtime.name)); // Upon renaming the install name, the code signature of the file will invalidate, // so we will sign it again. - apple_darwin_sign_file(&dst); + apple_darwin_sign_file(builder, &dst); diff --git a/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_dist.rs b/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_dist.rs new file mode 100644 index 000000000000..261b298ee1e2 --- /dev/null +++ b/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_dist.rs @@ -0,0 +1,20 @@ +$NetBSD: patch-src_bootstrap_src_core_build__steps_dist.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Backport https://github.com/rust-lang/rust/pull/130110/ +"make dist vendoring configurable" + +--- src/bootstrap/src/core/build_steps/dist.rs.orig 2024-09-22 17:31:33.331112310 +0000 ++++ src/bootstrap/src/core/build_steps/dist.rs +@@ -1009,11 +1009,7 @@ impl Step for PlainSourceTarball { + write_git_info(builder.rust_info().info(), plain_dst_src); + write_git_info(builder.cargo_info.info(), &plain_dst_src.join("./src/tools/cargo")); + +- // If we're building from git or tarball sources, we need to vendor +- // a complete distribution. +- if builder.rust_info().is_managed_git_subrepository() +- || builder.rust_info().is_from_tarball() +- { ++ if builder.config.dist_vendor { + // FIXME: This code looks _very_ similar to what we have in `src/core/build_steps/vendor.rs` + // perhaps it should be removed in favor of making `dist` perform the `vendor` step? + diff --git a/lang/rust/patches/patch-src_bootstrap_src_core_config_config.rs b/lang/rust/patches/patch-src_bootstrap_src_core_config_config.rs new file mode 100644 index 000000000000..bcc772dec14d --- /dev/null +++ b/lang/rust/patches/patch-src_bootstrap_src_core_config_config.rs @@ -0,0 +1,45 @@ +$NetBSD: patch-src_bootstrap_src_core_config_config.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Backport +https://github.com/rust-lang/rust/pull/130110/ +"make dist vendoring configurable" + +--- src/bootstrap/src/core/config/config.rs.orig 2024-09-22 17:38:21.382609357 +0000 ++++ src/bootstrap/src/core/config/config.rs +@@ -300,6 +300,7 @@ pub struct Config { + pub dist_compression_formats: Option>, + pub dist_compression_profile: String, + pub dist_include_mingw_linker: bool, ++ pub dist_vendor: bool, + + // libstd features + pub backtrace: bool, // support for RUST_BACKTRACE +@@ -904,6 +905,7 @@ define_config! { + compression_formats: Option> = "compression-formats", + compression_profile: Option = "compression-profile", + include_mingw_linker: Option = "include-mingw-linker", ++ vendor: Option = "vendor", + } + } + +@@ -1965,13 +1967,19 @@ impl Config { + compression_formats, + compression_profile, + include_mingw_linker, ++ vendor, + } = dist; + config.dist_sign_folder = sign_folder.map(PathBuf::from); + config.dist_upload_addr = upload_addr; + config.dist_compression_formats = compression_formats; + set(&mut config.dist_compression_profile, compression_profile); + set(&mut config.rust_dist_src, src_tarball); +- set(&mut config.dist_include_mingw_linker, include_mingw_linker) ++ set(&mut config.dist_include_mingw_linker, include_mingw_linker); ++ config.dist_vendor = vendor.unwrap_or_else(|| { ++ // If we're building from git or tarball sources, enable it by default. ++ config.rust_info.is_managed_git_subrepository() ++ || config.rust_info.is_from_tarball() ++ }); + } + + if let Some(r) = rustfmt { diff --git a/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs index 9eab28030c88..2b0902b639b3 100644 --- a/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs +++ b/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs @@ -1,11 +1,19 @@ -$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.14 2024/04/18 09:29:42 pin Exp $ +$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.15 2024/11/24 16:13:43 he Exp $ Don't attempt incremental operations on sparc64, ref. https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/ --- src/tools/cargo/tests/testsuite/build.rs.orig 2019-08-13 06:27:40.000000000 +0000 +++ src/tools/cargo/tests/testsuite/build.rs -@@ -47,6 +47,7 @@ fn cargo_fail_with_no_stderr() { +@@ -41,6 +41,7 @@ i am foo + .run(); + } + ++#[cfg(not(target_arch = "sparc64"))] + #[cargo_test] + fn build_with_symlink_to_path_dependency_with_build_script_in_git() { + if !symlink_supported() { +@@ -103,6 +104,7 @@ fn cargo_fail_with_no_stderr() { /// Checks that the `CARGO_INCREMENTAL` environment variable results in /// `rustc` getting `-C incremental` passed to it. @@ -13,19 +21,19 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment #[cargo_test] fn cargo_compile_incremental() { let p = project() -@@ -69,6 +70,7 @@ fn cargo_compile_incremental() { +@@ -132,6 +134,7 @@ fn cargo_compile_incremental() { .run(); } +#[cfg(not(target_arch = "sparc64"))] + #[allow(deprecated)] #[cargo_test] fn incremental_profile() { - let p = project() -@@ -111,6 +113,7 @@ fn incremental_profile() { +@@ -176,6 +179,7 @@ fn incremental_profile() { .run(); } +#[cfg(not(target_arch = "sparc64"))] + #[allow(deprecated)] #[cargo_test] fn incremental_config() { - let p = project() diff --git a/lang/rust/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mips.rs b/lang/rust/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mips.rs deleted file mode 100644 index 6b289a087cbc..000000000000 --- a/lang/rust/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mips.rs +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mips.rs,v 1.1 2024/07/15 03:32:24 wiz Exp $ - -Add entry for NetBSD/mips. - ---- vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2024-01-06 21:03:21.781003759 +0000 -+++ vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mips.rs 2024-01-06 22:27:31.830676317 +0000 -@@ -0,0 +1,22 @@ -+use PT_FIRSTMACH; -+ -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type c_char = i8; -+pub type __cpu_simple_lock_nv_t = ::c_int; -+ -+// should be pub(crate), but that requires Rust 1.18.0 -+cfg_if! { -+ if #[cfg(libc_const_size_of)] { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1; -+ } else { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = 8 - 1; -+ } -+} -+ -+pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1; -+pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2; -+pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 3; -+pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 4; diff --git a/lang/rust/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/lang/rust/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs deleted file mode 100644 index cc352ff2791c..000000000000 --- a/lang/rust/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.2 2024/04/18 09:29:42 pin Exp $ - -Add support for NetBSD/riscv64. - ---- vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2024-01-06 21:03:21.781003759 +0000 -+++ vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/riscv64.rs 2024-01-06 22:31:25.289387359 +0000 -@@ -0,0 +1,22 @@ -+use PT_FIRSTMACH; -+ -+pub type c_long = i64; -+pub type c_ulong = u64; -+pub type c_char = u8; -+pub type __cpu_simple_lock_nv_t = ::c_int; -+ -+// should be pub(crate), but that requires Rust 1.18.0 -+cfg_if! { -+ if #[cfg(libc_const_size_of)] { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1; -+ } else { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = 8 - 1; -+ } -+} -+ -+pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0; -+pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1; -+pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2; -+pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3; diff --git a/lang/rust/patches/patch-vendor_libc-0.2.153_src_unix_solarish_mod.rs b/lang/rust/patches/patch-vendor_libc-0.2.153_src_unix_solarish_mod.rs deleted file mode 100644 index 1f82c535d0eb..000000000000 --- a/lang/rust/patches/patch-vendor_libc-0.2.153_src_unix_solarish_mod.rs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-vendor_libc-0.2.153_src_unix_solarish_mod.rs,v 1.1 2024/10/13 19:04:39 he Exp $ - -Fix xattr build. - ---- vendor/libc-0.2.153/src/unix/solarish/mod.rs.orig 2024-08-29 18:01:10.748819643 +0000 -+++ vendor/libc-0.2.153/src/unix/solarish/mod.rs -@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58; - pub const ENOTRECOVERABLE: ::c_int = 59; - pub const ENOSTR: ::c_int = 60; - pub const ENODATA: ::c_int = 61; -+// This is not supported but is required for xattr -+pub const ENOATTR: ::c_int = ::ENODATA; - pub const ETIME: ::c_int = 62; - pub const ENOSR: ::c_int = 63; - pub const ENONET: ::c_int = 64; diff --git a/lang/rust/patches/patch-vendor_libc-0.2.154_src_unix_solarish_mod.rs b/lang/rust/patches/patch-vendor_libc-0.2.154_src_unix_solarish_mod.rs deleted file mode 100644 index 34a50aee0ae5..000000000000 --- a/lang/rust/patches/patch-vendor_libc-0.2.154_src_unix_solarish_mod.rs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-vendor_libc-0.2.154_src_unix_solarish_mod.rs,v 1.1 2024/10/13 19:04:39 he Exp $ - -Fix xattr build. - ---- vendor/libc-0.2.154/src/unix/solarish/mod.rs.orig 2024-08-29 18:02:22.936992533 +0000 -+++ vendor/libc-0.2.154/src/unix/solarish/mod.rs -@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58; - pub const ENOTRECOVERABLE: ::c_int = 59; - pub const ENOSTR: ::c_int = 60; - pub const ENODATA: ::c_int = 61; -+// This is not supported but is required for xattr -+pub const ENOATTR: ::c_int = ::ENODATA; - pub const ETIME: ::c_int = 62; - pub const ENOSR: ::c_int = 63; - pub const ENONET: ::c_int = 64; diff --git a/lang/rust/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs new file mode 100644 index 000000000000..4c600522c915 --- /dev/null +++ b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs @@ -0,0 +1,24 @@ +$NetBSD: patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Don't try to do neon / SIMD on big-endian aarch64. + +--- vendor/memchr-2.7.4/src/arch/aarch64/memchr.rs.orig 2024-09-22 14:55:32.455792108 +0000 ++++ vendor/memchr-2.7.4/src/arch/aarch64/memchr.rs +@@ -8,7 +8,7 @@ available for `aarch64` targets.) + + macro_rules! defraw { + ($ty:ident, $find:ident, $start:ident, $end:ident, $($needles:ident),+) => {{ +- #[cfg(target_feature = "neon")] ++ #[cfg(all(target_feature = "neon", target_endian = "little"))] + { + use crate::arch::aarch64::neon::memchr::$ty; + +@@ -19,7 +19,7 @@ macro_rules! defraw { + // enabled. + $ty::new_unchecked($($needles),+).$find($start, $end) + } +- #[cfg(not(target_feature = "neon"))] ++ #[cfg(not(all(target_feature = "neon", target_endian = "little")))] + { + use crate::arch::all::memchr::$ty; + diff --git a/lang/rust/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs new file mode 100644 index 000000000000..af2fc475e2b7 --- /dev/null +++ b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs @@ -0,0 +1,15 @@ +$NetBSD: patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Don't try to do neon / SIMD on big-endian aarch64. + +--- vendor/memchr-2.7.4/src/arch/aarch64/mod.rs.orig 2024-09-22 19:17:13.167426584 +0000 ++++ vendor/memchr-2.7.4/src/arch/aarch64/mod.rs +@@ -2,6 +2,8 @@ + Vector algorithms for the `aarch64` target. + */ + ++#[cfg(target_endian = "little")] + pub mod neon; + ++#[cfg(target_endian = "little")] + pub(crate) mod memchr; diff --git a/lang/rust/patches/patch-vendor_memchr-2.7.4_src_memchr.rs b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_memchr.rs new file mode 100644 index 000000000000..e93f508c7862 --- /dev/null +++ b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_memchr.rs @@ -0,0 +1,128 @@ +$NetBSD: patch-vendor_memchr-2.7.4_src_memchr.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Don't try to do neon / SIMD on big-endian aarch64. + +--- vendor/memchr-2.7.4/src/memchr.rs.orig 2024-09-22 14:50:24.931022916 +0000 ++++ vendor/memchr-2.7.4/src/memchr.rs +@@ -518,14 +518,14 @@ unsafe fn memchr_raw( + { + crate::arch::wasm32::memchr::memchr_raw(needle, start, end) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::memchr_raw(needle, start, end) + } + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::One::new(needle).find_raw(start, end) +@@ -551,14 +551,14 @@ unsafe fn memrchr_raw( + { + crate::arch::wasm32::memchr::memrchr_raw(needle, start, end) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::memrchr_raw(needle, start, end) + } + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::One::new(needle).rfind_raw(start, end) +@@ -585,14 +585,14 @@ unsafe fn memchr2_raw( + { + crate::arch::wasm32::memchr::memchr2_raw(needle1, needle2, start, end) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::memchr2_raw(needle1, needle2, start, end) + } + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::Two::new(needle1, needle2) +@@ -620,7 +620,7 @@ unsafe fn memrchr2_raw( + { + crate::arch::wasm32::memchr::memrchr2_raw(needle1, needle2, start, end) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::memrchr2_raw( + needle1, needle2, start, end, +@@ -629,7 +629,7 @@ unsafe fn memrchr2_raw( + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::Two::new(needle1, needle2) +@@ -662,7 +662,7 @@ unsafe fn memchr3_raw( + needle1, needle2, needle3, start, end, + ) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::memchr3_raw( + needle1, needle2, needle3, start, end, +@@ -671,7 +671,7 @@ unsafe fn memchr3_raw( + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::Three::new(needle1, needle2, needle3) +@@ -704,7 +704,7 @@ unsafe fn memrchr3_raw( + needle1, needle2, needle3, start, end, + ) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::memrchr3_raw( + needle1, needle2, needle3, start, end, +@@ -713,7 +713,7 @@ unsafe fn memrchr3_raw( + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::Three::new(needle1, needle2, needle3) +@@ -736,14 +736,14 @@ unsafe fn count_raw(needle: u8, start: * + { + crate::arch::wasm32::memchr::count_raw(needle, start, end) + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + crate::arch::aarch64::memchr::count_raw(needle, start, end) + } + #[cfg(not(any( + target_arch = "x86_64", + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + crate::arch::all::memchr::One::new(needle).count_raw(start, end) diff --git a/lang/rust/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs new file mode 100644 index 000000000000..2a07b4b6db01 --- /dev/null +++ b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs @@ -0,0 +1,78 @@ +$NetBSD: patch-vendor_memchr-2.7.4_src_memmem_searcher.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Don't try to use neon / SIMD on big-endian aarch64. + +--- vendor/memchr-2.7.4/src/memmem/searcher.rs.orig 2024-09-22 14:44:21.224731060 +0000 ++++ vendor/memchr-2.7.4/src/memmem/searcher.rs +@@ -3,7 +3,7 @@ use crate::arch::all::{ + rabinkarp, twoway, + }; + +-#[cfg(target_arch = "aarch64")] ++#[cfg(all(target_arch = "aarch64", target_endian = "little"))] + use crate::arch::aarch64::neon::packedpair as neon; + #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))] + use crate::arch::wasm32::simd128::packedpair as simd128; +@@ -129,7 +129,7 @@ impl Searcher { + Searcher::twoway(needle, rabinkarp, prestrat) + } + } +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + { + if let Some(pp) = neon::Finder::with_pair(needle, pair) { + if do_packed_search(needle) { +@@ -152,7 +152,7 @@ impl Searcher { + #[cfg(not(any( + all(target_arch = "x86_64", target_feature = "sse2"), + all(target_arch = "wasm32", target_feature = "simd128"), +- target_arch = "aarch64" ++ all(target_arch = "aarch64", target_endian = "little") + )))] + { + if prefilter.is_none() { +@@ -253,7 +253,7 @@ union SearcherKind { + avx2: crate::arch::x86_64::avx2::packedpair::Finder, + #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))] + simd128: crate::arch::wasm32::simd128::packedpair::Finder, +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + neon: crate::arch::aarch64::neon::packedpair::Finder, + } + +@@ -421,7 +421,7 @@ unsafe fn searcher_kind_simd128( + /// # Safety + /// + /// Callers must ensure that the `searcher.kind.neon` union field is set. +-#[cfg(target_arch = "aarch64")] ++#[cfg(all(target_arch = "aarch64", target_endian = "little"))] + unsafe fn searcher_kind_neon( + searcher: &Searcher, + _prestate: &mut PrefilterState, +@@ -686,7 +686,7 @@ impl Prefilter { + } + + /// Return a prefilter using a aarch64 neon vector algorithm. +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + #[inline] + fn neon(finder: neon::Finder, needle: &[u8]) -> Prefilter { + trace!("building aarch64 neon prefilter"); +@@ -763,7 +763,7 @@ union PrefilterKind { + avx2: crate::arch::x86_64::avx2::packedpair::Finder, + #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))] + simd128: crate::arch::wasm32::simd128::packedpair::Finder, +- #[cfg(target_arch = "aarch64")] ++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))] + neon: crate::arch::aarch64::neon::packedpair::Finder, + } + +@@ -852,7 +852,7 @@ unsafe fn prefilter_kind_simd128( + /// # Safety + /// + /// Callers must ensure that the `strat.kind.neon` union field is set. +-#[cfg(target_arch = "aarch64")] ++#[cfg(all(target_arch = "aarch64", target_endian = "little"))] + unsafe fn prefilter_kind_neon( + strat: &Prefilter, + haystack: &[u8], diff --git a/lang/rust/patches/patch-vendor_memchr-2.7.4_src_vector.rs b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_vector.rs new file mode 100644 index 000000000000..dc5c31fb0707 --- /dev/null +++ b/lang/rust/patches/patch-vendor_memchr-2.7.4_src_vector.rs @@ -0,0 +1,15 @@ +$NetBSD: patch-vendor_memchr-2.7.4_src_vector.rs,v 1.1 2024/11/24 16:13:43 he Exp $ + +Don't try to do neon / SIMD on big-endian aarch64. + +--- vendor/memchr-2.7.4/src/vector.rs.orig 2024-09-22 14:16:06.473207292 +0000 ++++ vendor/memchr-2.7.4/src/vector.rs +@@ -289,7 +289,7 @@ mod x86avx2 { + } + } + +-#[cfg(target_arch = "aarch64")] ++#[cfg(all(target_arch = "aarch64", target_endian = "little"))] + mod aarch64neon { + use core::arch::aarch64::*; + diff --git a/lang/rust/rust.mk b/lang/rust/rust.mk index fe722cffc28e..82185914b67b 100644 --- a/lang/rust/rust.mk +++ b/lang/rust/rust.mk @@ -1,4 +1,4 @@ -# $NetBSD: rust.mk,v 1.10 2024/08/10 10:50:42 js Exp $ +# $NetBSD: rust.mk,v 1.11 2024/11/24 16:13:43 he Exp $ # # This file determines the type of rust package to use. #