pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/rust
Module Name: pkgsrc
Committed By: wiz
Date: Thu Apr 2 19:06:35 UTC 2026
Modified Files:
pkgsrc/lang/rust: Makefile buildlink3.mk cross.mk distinfo do-cross.mk
options.mk rust.mk
pkgsrc/lang/rust/files: gcc-wrap
pkgsrc/lang/rust/patches:
patch-compiler_rustc__codegen__ssa_src_back_linker.rs
patch-compiler_rustc__target_src_spec_base_netbsd.rs
patch-compiler_rustc__target_src_spec_mod.rs
patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
patch-src_bootstrap_src_core_build__steps_install.rs
patch-src_tools_rust-installer_install-template.sh
patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
Added Files:
pkgsrc/lang/rust/patches:
patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
patch-src_bootstrap_src_core_sanity.rs
patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs
patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs
patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
patch-vendor_openssl-sys-0.9.111_build_main.rs
Removed Files:
pkgsrc/lang/rust/patches:
patch-compiler_rustc__target_src_spec_Targets_sparc64__unknown__netbsd.rs
patch-library_std_src_sys_fs_unix.rs
patch-vendor_openssl-src-300.5.2+3.5.2_openssl_Configurations_10-main.conf
patch-vendor_openssl-src-300.5.2+3.5.2_openssl_crypto_aria_aria.c
patch-vendor_openssl-src-300.5.2+3.5.2_src_lib.rs
Log Message:
rust: update to 1.94.1.
Based on wip/rust194 by he@, adam@, pin@, jperkin@
3 major versions since the previous pkgsrc version.
To generate a diff of this commit:
cvs rdiff -u -r1.355 -r1.356 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/rust/buildlink3.mk \
pkgsrc/lang/rust/rust.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/rust/cross.mk
cvs rdiff -u -r1.195 -r1.196 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/rust/do-cross.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/lang/rust/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/rust/files/gcc-wrap
cvs rdiff -u -r1.21 -r1.22 \
pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
cvs rdiff -u -r1.2 -r0 \
pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_Targets_sparc64__unknown__netbsd.rs \
pkgsrc/lang/rust/patches/patch-library_std_src_sys_fs_unix.rs
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
cvs rdiff -u -r1.17 -r1.18 \
pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs \
pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_sanity.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs \
pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs \
pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_install.rs \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
cvs rdiff -u -r1.14 -r1.15 \
pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.2+3.5.2_openssl_Configurations_10-main.conf \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.2+3.5.2_openssl_crypto_aria_aria.c \
pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.2+3.5.2_src_lib.rs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.355 pkgsrc/lang/rust/Makefile:1.356
--- pkgsrc/lang/rust/Makefile:1.355 Thu Feb 12 01:43:00 2026
+++ pkgsrc/lang/rust/Makefile Thu Apr 2 19:06:34 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.355 2026/02/12 01:43:00 gutteridge Exp $
+# $NetBSD: Makefile,v 1.356 2026/04/02 19:06:34 wiz Exp $
-DISTNAME= rustc-1.91.1-src
+DISTNAME= rustc-1.94.1-src
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
-PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/
@@ -173,6 +172,14 @@ CONFIGURE_ARGS+= --set llvm.targets="Mip
CONFIGURE_ARGS+= --set llvm.targets="Mips;X86"
.endif
+RUSTLIB_COMPILER= lib/rustlib/rustc-src/rust/compiler
+RUSTC_CG_CRANELIFT= ${RUSTLIB_COMPILER}/rustc_codegen_cranelift
+
+CHECK_INTERPRETER_SKIP+= ${RUSTC_CG_CRANELIFT}/scripts/filter_profile.rs
+CHECK_INTERPRETER_SKIP+= ${RUSTC_CG_CRANELIFT}/scripts/rustup.sh
+CHECK_INTERPRETER_SKIP+= ${RUSTC_CG_CRANELIFT}/scripts/test_bootstrap.sh
+CHECK_INTERPRETER_SKIP+= ${RUSTC_CG_CRANELIFT}/scripts/test_rustc_tests.sh
+CHECK_INTERPRETER_SKIP+= ${RUSTLIB_COMPILER}/rustc_codegen_gcc/y.sh
CHECK_INTERPRETER_SKIP+= lib/rustlib/src/rust/library/backtrace/ci/*.sh
CHECK_INTERPRETER_SKIP+= lib/rustlib/src/rust/library/core/src/unicode/printable.py
CHECK_INTERPRETER_SKIP+= lib/rustlib/src/rust/library/stdarch/ci/*.sh
@@ -238,49 +245,49 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
DISTFILES:= ${DEFAULT_DISTFILES}
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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
@@ -292,7 +299,7 @@ DISTFILES:= ${DISTFILES} ${RUST_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.90.0
+RUST_STAGE0_VER= 1.93.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/
@@ -305,14 +312,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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.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
@@ -332,14 +339,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.90.0
+RUST_STAGE0_VER= 1.93.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.90.0
+RUST_STAGE0_VER= 1.93.1
RUST_ARCH= powerpc-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -348,7 +355,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOC
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.90.0
+RUST_STAGE0_VER= 1.93.1
RUST_ARCH= aarch64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -356,17 +363,17 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
-#.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
-#RUST_STAGE0_VER= 1.90.0
-#RUST_ARCH= aarch64_be-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}
-#SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
-#SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
-#.endif
+.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
+RUST_STAGE0_VER= 1.93.1
+RUST_ARCH= aarch64_be-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}
+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.90.0
+RUST_STAGE0_VER= 1.93.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
@@ -376,7 +383,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER= 1.90.0
+RUST_STAGE0_VER= 1.93.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}
@@ -385,7 +392,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= armv6-unknown-netbsd-eabihf
-RUST_STAGE0_VER= 1.90.0
+RUST_STAGE0_VER= 1.93.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}
@@ -394,7 +401,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_
.endif
#.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
#RUST_ARCH= mipsel-unknown-netbsd
-#RUST_STAGE0_VER= 1.90.0
+#RUST_STAGE0_VER= 1.93.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}
@@ -403,7 +410,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_
#.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= riscv64gc-unknown-netbsd
-RUST_STAGE0_VER= 1.90.0
+RUST_STAGE0_VER= 1.93.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}
@@ -449,15 +456,15 @@ CKSUMS+= ead4bda23c322bde8c01e48d4cd19b7
CKSUM_CRATES+= vendor/openssl-src-300.5.0+3.5.0
CKSUMS+= 16c0b9fa70475cfb50ac21ad4ce049b494c45b3270fed386013785a28abb8d0a
-CKSUMS+= 6e30595035395b92291de1b59b6e7b3e19732f15a6012bfe0c239b62c8738225
+CKSUMS+= e2817c457afa7efc0f2ca62ce9dab5254eb5ddd9a5fd9e75bba2789be92c7b14
CKSUMS+= 6e62515e67910aea2f04b64c643aa2545732f9dd7bf0abf87d8accf8c2c1fb88
CKSUMS+= ccc5252660386fbfec2d66423f2dc87e6da74efd39ca0fcd7c7fd583056725c1
CKSUMS+= ac5501e7bff0f4384db0537307b362bf1bcb120d8b5859e5f08bd796e78feaea
CKSUMS+= 6d2c2831119e059d35e81a89b08195a29e325f68acfd86a3a7157ebf8e78182d
-CKSUM_CRATES+= vendor/openssl-src-300.5.2+3.5.2
-CKSUMS+= d29d6f116de18db723e93d74b4387eb0a672c574c8435526c71acbf00ca368ec
-CKSUMS+= db4afc6c5aae797551c23ebd7930c1f4c931028b4177b3337b492ec8ce20944b
+CKSUM_CRATES+= vendor/openssl-src-300.5.4+3.5.4
+CKSUMS+= 33f1e78110293a8558ae997ed57e7aac72c5bfd47a241dc7f6e2ffa98b7a7137
+CKSUMS+= d0232a8b63c2fb396ed7551eb983b16b6ebafbba4b33d4434e167b05ee290f8f
# covered by 3.5.0:
#CKSUMS+= 6e62515e67910aea2f04b64c643aa2545732f9dd7bf0abf87d8accf8c2c1fb88
#CKSUMS+= ccc5252660386fbfec2d66423f2dc87e6da74efd39ca0fcd7c7fd583056725c1
@@ -480,6 +487,12 @@ CKSUMS+= 023a3e755d7d4c5ca6e4f8ce7a8b1dc
CKSUMS+= f66ce762ec63c28621a0d6d48bd5872b96e71f0bfb6f88576a6e2cba0c229e12
CKSUMS+= 656834a8bd87476b074f36bcc2aeb33a74a0a0a6db5d140c35c4b3eb385afebe
+CKSUM_CRATES+= vendor/openssl-sys-0.9.111
+CKSUMS+= 0c5a4bd38ed007182cfec3cf0824a4806e5c629b9d69e3cc2a5b6e9be3eec280
+CKSUMS+= 777a22f3cd39ad01f2e559ecf600bb9c03ec42e0b9fbe41746f42938e162d523
+CKSUMS+= d17fa8715a43ff0da872ac504abb2cc0a395644e8f5c8c128812758c458d5963
+CKSUMS+= 02d5de4e4976450f8e665e0eff664e93063dd53aec2cb75ecee0847e3c0c086e
+
CKSUM_CRATES+= vendor/libc-0.2.155
CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
@@ -514,7 +527,22 @@ CKSUMS+= 2dc054435fd2976536b6685d66ba679
CKSUM_CRATES+= vendor/libc-0.2.175
CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
-CKSUMS+= a7287f4e6e63cbd2d28ad5665b6515eaab5098ef063ede73b14ed7c7a76732ee
+CKSUMS+= f446c996f00e4d15fd25461a30c767c05d083df9e047b0da497ce7c545acfa96
+CKSUMS+= 40c61bfb238ba988391cabe55e389c33e7adce7cf1cdd8a6db56406401f566e3
+CKSUMS+= 65fe8c348242f176decd9c71be8dfce0baa005e7cb0cab2f3d2a05dae2593ecd
+
+CKSUM_CRATES+= vendor/libc-0.2.177
+# covered by libc-0.2.175
+#CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
+#CKSUMS+= f446c996f00e4d15fd25461a30c767c05d083df9e047b0da497ce7c545acfa96
+CKSUMS+= 461feb5dc8dddea353ab6d32519045bc9f16525a48449c93dc7148469d94c9c3
+CKSUMS+= 1cab8d313161004e10463c6fd37c0846b31dbb7ccd0dbb509dd4e3edd94dda5b
+
+CKSUM_CRATES+= vendor/libc-0.2.178
+CKSUMS+= a70b6263111ccd1d0d1977edc3c2e3343e8eba09d04fabdb6257a2fddd5a050b
+CKSUMS+= 5b141cbc4c6339d401bdc1e82d86adcc6deb448caacf3d3df802466804017ab7
+CKSUMS+= 2ec1e4bc0927ee68b2d7f79142ac93f3eee432a1d15ef43feab6acb602520b60
+CKSUMS+= ebe3d9de2db1660c690c347f14489b87fe1371877438f6950cfbb6900a6252b1
CKSUM_CRATES+= vendor/zerocopy-0.7.32
CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
@@ -639,7 +667,8 @@ do-install:
${TOOL_PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
.if ${OPSYS} == "Darwin"
cd ${DESTDIR}${PREFIX}/lib && \
- for lib in rustlib/*/lib/libstd-*.${SHLIB_EXT}; do \
+ for lib in rustlib/*/lib/lib*.${SHLIB_EXT}; do \
+ install_name_tool -id ${PREFIX}/lib/$${lib##*/} $${lib}; \
${LN} -f $${lib} $${lib##*/}; \
done
.endif
@@ -649,7 +678,7 @@ USE_TOOLS+= paxctl
# Turn off address space layout randomization
# so that we can build firefox natively:
post-install:
- paxctl +a ${DESTDIR}${PREFIX}/bin/rustc
+ ${TOOLS_PLATFORM.paxctl} +a ${DESTDIR}${PREFIX}/bin/rustc
.endif
SUBST_CLASSES+= destdir
@@ -718,7 +747,7 @@ stage0-bootstrap: install
${CP} `${PKG_CC} -print-file-name=$${lib}` \
${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
done; \
- for lib in libLLVM.so.19.1 libcrypto.so.3 libcurl.so.4 \
+ for lib in libLLVM.so.20.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; \
@@ -738,7 +767,9 @@ stage0-bootstrap: install
${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/pkgsrc' $$f; \
done; \
for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/*/*.so* \
- ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/bin/*; do \
+ ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/bin/* \
+ ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/bin/*/*; do \
+ /bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \
${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \
done; \
cd ${WRKDIR}; ${GTAR} -zcf ${BOOTSTRAP_NAME}.tar.gz ${BOOTSTRAP_NAME}
@@ -766,14 +797,6 @@ stage0-bootstrap: install
## Issues specific to: bootstrap AND NetBSD follow
-# rust sparc64 bootstraps are built for 8.0
-# and still depend on libstdc++.so.8.
-# Pull in compat80 on 9.x and newer.
-# XXX is this still correct?
-.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} && empty(OS_VERSION:M8.*)
-TOOL_DEPENDS+= compat80>=0:../../emulators/compat80
-.endif
-
.include "../../mk/atomic64.mk"
# This is for when we build natively:
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
Index: pkgsrc/lang/rust/buildlink3.mk
diff -u pkgsrc/lang/rust/buildlink3.mk:1.18 pkgsrc/lang/rust/buildlink3.mk:1.19
--- pkgsrc/lang/rust/buildlink3.mk:1.18 Thu Jul 24 10:33:38 2025
+++ pkgsrc/lang/rust/buildlink3.mk Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2025/07/24 10:33:38 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2026/04/02 19:06:34 wiz Exp $
BUILDLINK_TREE+= rust
@@ -9,7 +9,7 @@ BUILDLINK_TREE+= rust
.if !defined(RUST_BUILDLINK3_MK)
RUST_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.rust+= rust>=1.56.1
+BUILDLINK_API_DEPENDS.rust+= rust>=1.85.0
BUILDLINK_PKGSRCDIR.rust?= ../../lang/rust
BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/lib/rustlib
Index: pkgsrc/lang/rust/rust.mk
diff -u pkgsrc/lang/rust/rust.mk:1.18 pkgsrc/lang/rust/rust.mk:1.19
--- pkgsrc/lang/rust/rust.mk:1.18 Wed Mar 4 12:17:34 2026
+++ pkgsrc/lang/rust/rust.mk Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: rust.mk,v 1.18 2026/03/04 12:17:34 jperkin Exp $
+# $NetBSD: rust.mk,v 1.19 2026/04/02 19:06:34 wiz Exp $
#
# This file determines the type of rust package to use.
#
@@ -26,7 +26,7 @@
# RUST_REQ
# The minimum version of Rust required by the package.
#
-# Default: 1.56.1
+# Default: 1.85.0
#
# RUST_RUNTIME
# Whether rust is a runtime dependency.
@@ -38,7 +38,7 @@
.include "../../mk/bsd.fast.prefs.mk"
.include "platform.mk"
-RUST_REQ?= 1.56.1
+RUST_REQ?= 1.85.0
RUST_RUNTIME?= no
.if ${MACHINE_PLATFORM:M*-*-earm*}
Index: pkgsrc/lang/rust/cross.mk
diff -u pkgsrc/lang/rust/cross.mk:1.15 pkgsrc/lang/rust/cross.mk:1.16
--- pkgsrc/lang/rust/cross.mk:1.15 Mon Aug 25 17:51:11 2025
+++ pkgsrc/lang/rust/cross.mk Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.15 2025/08/25 17:51:11 wiz Exp $
+# $NetBSD: cross.mk,v 1.16 2026/04/02 19:06:34 wiz Exp $
# These settings may be used to cross-build rust.
#
@@ -22,6 +22,7 @@
#CROSS_ROOT= /u/i386
#CROSS_ROOT= /u/mipsel
#CROSS_ROOT= /u/riscv64
+#CROSS_ROOT= /u/m68k
#CROSS_ROOT= /
#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT}
@@ -35,6 +36,7 @@
#GNU_CROSS_TARGET= i486--netbsdelf
#GNU_CROSS_TARGET= mipsel--netbsd
#GNU_CROSS_TARGET= riscv64--netbsd
+#GNU_CROSS_TARGET= m68k--netbsdelf
#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
# To cross-build rust, you need to specify
@@ -51,6 +53,7 @@
#TARGET= i586-unknown-netbsd
#TARGET= mipsel-unknown-netbsd
#TARGET= riscv64gc-unknown-netbsd
+#TARGET= m68k-unknown-netbsd
#
#SCRIPTS= ${WRKDIR}/scripts
#CONFIGURE_ARGS+= --host=${TARGET}
Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.195 pkgsrc/lang/rust/distinfo:1.196
--- pkgsrc/lang/rust/distinfo:1.195 Wed Jan 14 06:44:31 2026
+++ pkgsrc/lang/rust/distinfo Thu Apr 2 19:06:34 2026
@@ -1,123 +1,129 @@
-$NetBSD: distinfo,v 1.195 2026/01/14 06:44:31 wiz Exp $
+$NetBSD: distinfo,v 1.196 2026/04/02 19:06:34 wiz Exp $
-BLAKE2s (rust-1.90.0-aarch64-apple-darwin.tar.gz) = 8d6a1bbf17b2c2891086bf53078bab0125818f20fd433407021e411d1d9fbc76
-SHA512 (rust-1.90.0-aarch64-apple-darwin.tar.gz) = 2d15c22b86aa90f68ae9bea6d699213f661cfa8711189acc036e9969c13877fe3fc55d4ef9c6c08efca81191c272d2e237e53ad28f9fecae666cd1071b7bbded
-Size (rust-1.90.0-aarch64-apple-darwin.tar.gz) = 376132551 bytes
-BLAKE2s (rust-1.90.0-aarch64-unknown-linux-gnu.tar.gz) = 6d4b58798d53d4d8d361eb32c15154fbc27fb346490cc031bfa4f16619aeb6be
-SHA512 (rust-1.90.0-aarch64-unknown-linux-gnu.tar.gz) = 90387c46e40fa5d65dc357c80e154a0db20929e03a689a00f525d7c920fc1f7045139d6fa77a74827a33aeafb3572c50e3490cb27ad1e9b24bda641a91948ea0
-Size (rust-1.90.0-aarch64-unknown-linux-gnu.tar.gz) = 317560788 bytes
-BLAKE2s (rust-1.90.0-aarch64-unknown-netbsd.tar.xz) = 127444dea2aea83cc98bc6abea5ebb6e07e079b59ebca3e071c41963a33bad02
-SHA512 (rust-1.90.0-aarch64-unknown-netbsd.tar.xz) = 3d95e01cb921fa8fdadd4fc5d40fa2c5199c4d32f3d6dfb1257499992f97287c17bd16b17b8e86065640d46fe8be4e9873e77a24cb3b8b04402625198dfbf1e2
-Size (rust-1.90.0-aarch64-unknown-netbsd.tar.xz) = 203450840 bytes
-BLAKE2s (rust-1.90.0-arm-unknown-linux-gnueabihf.tar.gz) = 427900b423b0bc1e4b021933fcb0eca3cf4a746c8d594c8c529a9a0c8b6e576a
-SHA512 (rust-1.90.0-arm-unknown-linux-gnueabihf.tar.gz) = 2a23b427e66e6aedb6d7a6f40ac9498cf1ad56e4a14113ca34eb50c000c893814cdeb557d7c0e512ee4b6a650e8cbf87cce34b0b1bf6a8ff251fb67c13cf3051
-Size (rust-1.90.0-arm-unknown-linux-gnueabihf.tar.gz) = 431694451 bytes
-BLAKE2s (rust-1.90.0-armv6-unknown-netbsd-eabihf.tar.xz) = 599f5868661520159f53581adde63a853e8cd98f42a473d71af076f82685ff7d
-SHA512 (rust-1.90.0-armv6-unknown-netbsd-eabihf.tar.xz) = ab40ba40858d45750a19c44b1d8641d6d53b49fa409bc16a0c6abe673602a4e282f6b56a2ab12c1671f764f380cb72285362e82d951135a388c693c4ce05d676
-Size (rust-1.90.0-armv6-unknown-netbsd-eabihf.tar.xz) = 166797652 bytes
-BLAKE2s (rust-1.90.0-armv7-unknown-linux-gnueabihf.tar.gz) = 3f2901a5effbbddc773a6f4e0e9d19fb5f73f62ba9382fbff409f2f53b121365
-SHA512 (rust-1.90.0-armv7-unknown-linux-gnueabihf.tar.gz) = 77e10746c8a7abfbb52aff05d5f91b5930d31f0875883bbadf78c050c52b035f80b0123812b1b9de74e9e10601c60fb651ea5221f7fc05b8ea409890ad7a5f70
-Size (rust-1.90.0-armv7-unknown-linux-gnueabihf.tar.gz) = 416722719 bytes
-BLAKE2s (rust-1.90.0-armv7-unknown-netbsd-eabihf.tar.xz) = fecd071d991c12dcd95fc5f63550090b04ed3e2f4429b26ec33a7ea6470a613c
-SHA512 (rust-1.90.0-armv7-unknown-netbsd-eabihf.tar.xz) = cf4857ee74869f8643c349c17f6763f9193dbca9d259f6ad788971dac94a3f4261cc1a1240c3ecfe1bcfa313c01c36238ce6ee26a9173d45c9587f64ed75bcbd
-Size (rust-1.90.0-armv7-unknown-netbsd-eabihf.tar.xz) = 166410804 bytes
-BLAKE2s (rust-1.90.0-i586-unknown-netbsd.tar.xz) = a58d55c415d710dbb50ec5c8614ad08703afdce2df6f9222093f2d9ebf7ac8bb
-SHA512 (rust-1.90.0-i586-unknown-netbsd.tar.xz) = 506b810a29cf3eaa0d6fec55f785becd6ad78eb468bc77b6b8b0fafc094804a28144c0210d13ee14d7afe9b698e6ea5b9a7b02dda7eeaee8d95b47566805c4aa
-Size (rust-1.90.0-i586-unknown-netbsd.tar.xz) = 224130032 bytes
-BLAKE2s (rust-1.90.0-i686-unknown-linux-gnu.tar.gz) = 86c534c492fc6e3a120d05369204ea67bf6de190ec38044212f38693b2bc80da
-SHA512 (rust-1.90.0-i686-unknown-linux-gnu.tar.gz) = 3ae049087d3ccf5cb81ed628d56620c21343e3e7ee1bd56e1e630218af8479525f2695b27fcded7940b5a5d1161e48c0ec7dce8c5f109bbb272fc406a1e8b6c4
-Size (rust-1.90.0-i686-unknown-linux-gnu.tar.gz) = 489963323 bytes
-BLAKE2s (rust-1.90.0-powerpc-unknown-netbsd.tar.xz) = c8949052f0d48c0c2f93ee6a749503811ca35f8564b3946d3b24cf5197df1c61
-SHA512 (rust-1.90.0-powerpc-unknown-netbsd.tar.xz) = 36577bf7aeea907ee5c0fbc40ff581305d8bd0f411b762c67ced60b83773a12e60b6f30bc00d2247a82438d182435a0bc34293c8ece792c2ac510c61d0abfdd9
-Size (rust-1.90.0-powerpc-unknown-netbsd.tar.xz) = 236658412 bytes
-BLAKE2s (rust-1.90.0-riscv64gc-unknown-netbsd.tar.xz) = 619eb3473bb0014b1f21687173edde8a92c808d6def619c20c12dde874d56e50
-SHA512 (rust-1.90.0-riscv64gc-unknown-netbsd.tar.xz) = b37f223e44c65356db6f114107f50dd2427d7d081aafd48cd6f122bd068f13ec90f9783e68ca21cc83641127ac0350abd27c60f9b9a704af3f90e7ed874618eb
-Size (rust-1.90.0-riscv64gc-unknown-netbsd.tar.xz) = 219491628 bytes
-BLAKE2s (rust-1.90.0-sparc64-unknown-netbsd.tar.xz) = 3fb801196dcc987f3713352722c1919e25665715f06a973a5e53033ee0ce4174
-SHA512 (rust-1.90.0-sparc64-unknown-netbsd.tar.xz) = bb76526226c53d27d1b959cd001d61b0cef9189c257809ebc018669701499073eea1bd9cde2318e5e3aa51ea6913943804f1a7cef842067ef062b24e4406d070
-Size (rust-1.90.0-sparc64-unknown-netbsd.tar.xz) = 199327844 bytes
-BLAKE2s (rust-1.90.0-x86_64-apple-darwin.tar.gz) = 067be4d313bda0c8846054dcd9227e3fa91483b432ba96b5d738ab95dbde3ec9
-SHA512 (rust-1.90.0-x86_64-apple-darwin.tar.gz) = 9a5c3e7f5d6acaa0c6dfd634d909f30876e593d5d1d1049b3a3c7976d5a5ab283fc425f897a10b28465da6ec8d98c2f34596b7c3951df113af233dbd5e977d9d
-Size (rust-1.90.0-x86_64-apple-darwin.tar.gz) = 323309238 bytes
-BLAKE2s (rust-1.90.0-x86_64-unknown-freebsd.tar.gz) = de2ee478271739e732206071068a6971718b87bbe746dc49de44612c24dc3162
-SHA512 (rust-1.90.0-x86_64-unknown-freebsd.tar.gz) = f7dded375a03d14d8f9a8ab766887066545ec32b4c4ed984448adb5919fe328e4549fbe8caad44b446e8dab1be62c8f225269c27bffa9a0377e81bf6d29c25f8
-Size (rust-1.90.0-x86_64-unknown-freebsd.tar.gz) = 377636257 bytes
-BLAKE2s (rust-1.90.0-x86_64-unknown-illumos.tar.gz) = f06a7089ab6449a9c98b77ba3bdc73a8db6e8a4a7348ad7e39b364eccd8e16be
-SHA512 (rust-1.90.0-x86_64-unknown-illumos.tar.gz) = b536e9da5ff054f42a6ad0ecb64624642adb76b182b9b1ad1b8afd37b194d54e14d84482afbf5169ea1964dd89c6b76deac0bcc22d488459dff168f0abf041ec
-Size (rust-1.90.0-x86_64-unknown-illumos.tar.gz) = 246398731 bytes
-BLAKE2s (rust-1.90.0-x86_64-unknown-linux-gnu.tar.gz) = 630c126ad5728c2c12beb56b16976e3d1d97e51de550abf47e032dda44d647ef
-SHA512 (rust-1.90.0-x86_64-unknown-linux-gnu.tar.gz) = 14deae3ac4a2e5a9ece3bde66eb092c757f6425caa082ecd679d24a11c624ff9d2662b003024926a404f2638dae455b25beccec718c4b674aed57eac2c59b203
-Size (rust-1.90.0-x86_64-unknown-linux-gnu.tar.gz) = 365533255 bytes
-BLAKE2s (rust-1.90.0-x86_64-unknown-netbsd.tar.xz) = 2467cca6a872d1e448ac8234c32e7a214221a0348b56a40978063de865204ed5
-SHA512 (rust-1.90.0-x86_64-unknown-netbsd.tar.xz) = eb4b65d61e484c81af5338eb756d9fdda61179b790656d2422877c6803c2f7a61920638d2af612d6f4e12c587a8218a231e06042533dc2162b353f3b6c900f80
-Size (rust-1.90.0-x86_64-unknown-netbsd.tar.xz) = 228083524 bytes
-BLAKE2s (rust-std-1.90.0-aarch64-apple-darwin.tar.gz) = b234f1bcc0c7753fc02983f35c495ba9e922eb549d415f39b18c2ce3fc89a39c
-SHA512 (rust-std-1.90.0-aarch64-apple-darwin.tar.gz) = 848fde381459d8972e743a5b6884fbfb1237bea2371f68cf8e211fcb5d9f8d5fcd4221a1dc009e43fe0f38f3c104155fe3dae13a7626a1e85e605113abbd1263
-Size (rust-std-1.90.0-aarch64-apple-darwin.tar.gz) = 44872106 bytes
-BLAKE2s (rust-std-1.90.0-aarch64-unknown-linux-gnu.tar.gz) = 2a4c10fe2dec72877fc03600bc0d9b0ffef301ed18e0fe0fd25873c1c6705ba9
-SHA512 (rust-std-1.90.0-aarch64-unknown-linux-gnu.tar.gz) = 3f6d6498da00ce503e89a92613c3cc5920cf13ddc32df2c688859bc16687caf44ea747cb8af39b4e63e69bbc748538a4535a2acd6ee7652a437c34dc0e586123
-Size (rust-std-1.90.0-aarch64-unknown-linux-gnu.tar.gz) = 49153407 bytes
-BLAKE2s (rust-std-1.90.0-aarch64-unknown-netbsd.tar.xz) = d7373e156b766fb3f723fe9f7ca151908d739a8999fb33da1e6c9519e695f702
-SHA512 (rust-std-1.90.0-aarch64-unknown-netbsd.tar.xz) = 3e84556b0f512bafb0b139e3fc3bc54396f5dd90c10fba6ae5c7604bf5d129adaa5da388fc51c7ccf4cde2cade3bb9dee6db13e74bc5c044368bb12a0c8a5eec
-Size (rust-std-1.90.0-aarch64-unknown-netbsd.tar.xz) = 25463000 bytes
-BLAKE2s (rust-std-1.90.0-arm-unknown-linux-gnueabihf.tar.gz) = 62e58efb450593ddaf4196f99e0a097901ba5527f49a9de9cd5a1d2d14a48b5d
-SHA512 (rust-std-1.90.0-arm-unknown-linux-gnueabihf.tar.gz) = d759ac8d7d973afbbdde9a9a30e5f391797d691eaf6813b6c29823811c23ace814e14eaaf40e677724f2342965892f9f93fb805f78842e773dcba1e937dddb8b
-Size (rust-std-1.90.0-arm-unknown-linux-gnueabihf.tar.gz) = 41056115 bytes
-BLAKE2s (rust-std-1.90.0-armv6-unknown-netbsd-eabihf.tar.xz) = 9d00838e08351e1bff3d51c02208d7a88bbba3b0e88e30ff8a3a881e7c67d4b3
-SHA512 (rust-std-1.90.0-armv6-unknown-netbsd-eabihf.tar.xz) = 93ba35b1cb72cefdf57a816c4c1fd915f39fea52431daf0dc7826e006895b3d7a5b4c1f2a052cb1977fa330c91d454681e3dc970d0e5b22db68d9c79ff47f647
-Size (rust-std-1.90.0-armv6-unknown-netbsd-eabihf.tar.xz) = 23613596 bytes
-BLAKE2s (rust-std-1.90.0-armv7-unknown-linux-gnueabihf.tar.gz) = d3f9c3a94ebe96d711e5cdfa3d26b6e0841159a9f2b12522f994d3c4e2d48fa9
-SHA512 (rust-std-1.90.0-armv7-unknown-linux-gnueabihf.tar.gz) = f7bd7a05b5d98889accfedf506070c61209629fa8168e7a9e9bb4132ff97017d24da11fb72e5ae7a8237d7d7d025d73676e331009828d3451581c2f6958ebb9f
-Size (rust-std-1.90.0-armv7-unknown-linux-gnueabihf.tar.gz) = 42590464 bytes
-BLAKE2s (rust-std-1.90.0-armv7-unknown-netbsd-eabihf.tar.xz) = 939884babae9a62311fc71578e5fd2686f199629ea9ae38a58889d6ac7fc4418
-SHA512 (rust-std-1.90.0-armv7-unknown-netbsd-eabihf.tar.xz) = 7483e51b4764d46a0d155425d953081208b6c3ab0fb55d63f177e37cd5a12fbc903350e6a28ef019c3d8a40d9b1d2f3ca176824acba86a597c17c78fe10bfe04
-Size (rust-std-1.90.0-armv7-unknown-netbsd-eabihf.tar.xz) = 24724804 bytes
-BLAKE2s (rust-std-1.90.0-i586-unknown-netbsd.tar.xz) = 23ee35dffb69b90241cbf518f6a785a329473dcc05150491e2ceed9806a37c95
-SHA512 (rust-std-1.90.0-i586-unknown-netbsd.tar.xz) = b998c1f62b68dd2a0cfde9ac431d44013cdab785f008ed1bb946644d822199cb080fbc0bf4183669af18536a1d59b4c9f42840c1174d08566e3c70c06de16862
-Size (rust-std-1.90.0-i586-unknown-netbsd.tar.xz) = 26236456 bytes
-BLAKE2s (rust-std-1.90.0-i686-unknown-linux-gnu.tar.gz) = 94fc26071bb63626c3e975cd44ad6045a9dbc36f0833a0c4ff93b8948cb198d9
-SHA512 (rust-std-1.90.0-i686-unknown-linux-gnu.tar.gz) = efc920ee2cde8ddb9ef6cd7f6dca026bc66d1f8e2f0a300b777a0ccc46369e65c2f7ce8efa25ea6cbfe97275e1dec51eaeceb5aa66c995b068495a6875d2f641
-Size (rust-std-1.90.0-i686-unknown-linux-gnu.tar.gz) = 44960857 bytes
-BLAKE2s (rust-std-1.90.0-powerpc-unknown-netbsd.tar.xz) = 2ae3090894b5abb8096777c26af8f2e84b4d557bc5569236a754ec02fd925f6c
-SHA512 (rust-std-1.90.0-powerpc-unknown-netbsd.tar.xz) = 7c8aa15d84518db9e9ec70c508cf626a256ae0d82bed7c2d763c9f66119128bf2ede8af3076f99c138f3640ae52eb4f0973cf5164a40f23653bb6a8ff1ead897
-Size (rust-std-1.90.0-powerpc-unknown-netbsd.tar.xz) = 23598392 bytes
-BLAKE2s (rust-std-1.90.0-riscv64gc-unknown-netbsd.tar.xz) = 51b9b7acd4eea37bd566b951b11b06fe28145dde6b71e4fcc0900afce4ee55da
-SHA512 (rust-std-1.90.0-riscv64gc-unknown-netbsd.tar.xz) = 46f226d8090323d04e3f262f3b32b8e3eb2b9f7b7c6623a6a270861c731f4e02efc6b23e2c00d9c06e7588434368a9cbe21408bd3c5fb9096759e61f8b4c3155
-Size (rust-std-1.90.0-riscv64gc-unknown-netbsd.tar.xz) = 24055412 bytes
-BLAKE2s (rust-std-1.90.0-sparc64-unknown-netbsd.tar.xz) = 69fbc272167058263c4ceebdbc5385588e43e3180226d4a143e4f3d6aac1e4e4
-SHA512 (rust-std-1.90.0-sparc64-unknown-netbsd.tar.xz) = 627feaa71e84a58430c778b3ca89212fa2923263dfcdba0a5bbdc6189d014ca6371658d55b23b821c7f8299b2f77b571652bb11359b60dc367ce6c548e5aa406
-Size (rust-std-1.90.0-sparc64-unknown-netbsd.tar.xz) = 23524452 bytes
-BLAKE2s (rust-std-1.90.0-x86_64-apple-darwin.tar.gz) = c854ab30b58388fc6ab26b5674dcb36f47ddcf003728d55f0f3659052441c975
-SHA512 (rust-std-1.90.0-x86_64-apple-darwin.tar.gz) = d42dd3075e7e0106596826988aa8471ba38681e5b124bac166348e5d4ddbba309263b38656c944b5218fb548adafe7016a15f84c2c7883d2007db23bb00c796a
-Size (rust-std-1.90.0-x86_64-apple-darwin.tar.gz) = 47252675 bytes
-BLAKE2s (rust-std-1.90.0-x86_64-unknown-freebsd.tar.gz) = dbb87e81b78ef0826d3ca278eb24e3034145c16ef837a430e78c2900f47477bf
-SHA512 (rust-std-1.90.0-x86_64-unknown-freebsd.tar.gz) = 16672d5df5b479999b081900bd82f30e6ff905995398d6aedb470e639eab7d0cd378538396514bc3e17dd85aac2abc5fb809737ac4e37c64d7f4f51d65b60a81
-Size (rust-std-1.90.0-x86_64-unknown-freebsd.tar.gz) = 48621774 bytes
-BLAKE2s (rust-std-1.90.0-x86_64-unknown-linux-gnu.tar.gz) = 6527731104bf5ad56410e2832bb8f8e7e2f1b57ff41ad2732438faab5a15c826
-SHA512 (rust-std-1.90.0-x86_64-unknown-linux-gnu.tar.gz) = b039807dd93639b4d718437f444e8bc4b3cf98ececa0059984528b9339146693ad11c41478e0e41fad75170f81c51035f14de0b4c9ddb7b6e8da82c6b502261f
-Size (rust-std-1.90.0-x86_64-unknown-linux-gnu.tar.gz) = 51017986 bytes
-BLAKE2s (rust-std-1.90.0-x86_64-unknown-netbsd.tar.xz) = 02042a40e5d3e7a2931d95938a70bf7d837a471e73584a186dffcf5954e9f015
-SHA512 (rust-std-1.90.0-x86_64-unknown-netbsd.tar.xz) = 394d3d8b3df27eaf73c2d8945889263e339f2044d87afc74aef4b74f76fea5de84eb8b3a43f50d90214428a44fa16a0591fd885d7a702745b4bb2ea0cb79944b
-Size (rust-std-1.90.0-x86_64-unknown-netbsd.tar.xz) = 26720980 bytes
-BLAKE2s (rustc-1.91.1-src.tar.gz) = c8c23478ea9a4be3b6fb4da56413fb90ae907594b99d037f0c57c68ef7b4c8d4
-SHA512 (rustc-1.91.1-src.tar.gz) = b1b7981f58b884d6c51552f01b0190f5549dcb32e3d46635d4f68febe5a7a747f8cbb25a5ab8210a991cf8a576ba39c954459eed96fdb6d6839bc5df1dbbc5ac
-Size (rustc-1.91.1-src.tar.gz) = 628310872 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = bb4cc16be543116f3f7d981fd8ac349f37dad105
+BLAKE2s (rust-1.93.1-aarch64-apple-darwin.tar.gz) = 79c7b27c43db89e7dd8165b6aa067944004ab5b3483b5ae39b1390b714a7cf6a
+SHA512 (rust-1.93.1-aarch64-apple-darwin.tar.gz) = a1335f2101121fff361c8f7b4f02242402e26144b745c27ddb774c3831c589cb9b9d987789a3f680ac5e7230aad74d1af12c782c5036f7bdd99b4615620b56fa
+Size (rust-1.93.1-aarch64-apple-darwin.tar.gz) = 389523068 bytes
+BLAKE2s (rust-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 1f4b87ad7fa9c95a14714ecfc588018d01ab2e1a4b1b69e8d1269bc764d7605b
+SHA512 (rust-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 7b4b4f13e88761c25d32f667d3ea95335eaaebed8860198e840936b0513679e2ad8523a8e38e90ccd2698ee2cf557cea1f66ae3abaf1c740bc0a945250d440b1
+Size (rust-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 325195152 bytes
+BLAKE2s (rust-1.93.1-aarch64-unknown-netbsd.tar.xz) = cf656d4bf8a59dbbb9938f27219667d340295b629631bff304d00f0580e3a1e1
+SHA512 (rust-1.93.1-aarch64-unknown-netbsd.tar.xz) = 34c2abbe246e7768a9e6575a56c44946265b0b5abd2e33e530627806122214f8b50001016ae7afe2612edf8c9cd8207da7d441281d0315ff15515cdcc130e93b
+Size (rust-1.93.1-aarch64-unknown-netbsd.tar.xz) = 208207380 bytes
+BLAKE2s (rust-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = cebdf42794d11d22584e62d8b1a9b817d6b5d0e9051a61a7ece603457ab8085a
+SHA512 (rust-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 0cd6ee89d6c34037cc2bb4c0d7287338ce1e33e64477c228b233b7d2de1658d8d0a8e41ef3aafd217d02ff86f7acfc5a38012828cead7b5cf64be3a56b2ea793
+Size (rust-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 208380456 bytes
+BLAKE2s (rust-1.93.1-arm-unknown-linux-gnueabihf.tar.gz) = e15ee16cfe8df538a7287238bff6a447222653bb1d103e8ed0e95d162c8f44d9
+SHA512 (rust-1.93.1-arm-unknown-linux-gnueabihf.tar.gz) = c3c717872bfdaab27747354b029822ff48ac784137ec9933c26418f09497a3051f6f520b9bd6c38d088e5fe0c24412745390bfe375dc05afb61add6bdeba5795
+Size (rust-1.93.1-arm-unknown-linux-gnueabihf.tar.gz) = 443626846 bytes
+BLAKE2s (rust-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = d271a56b9ea20e4dda4168bd772418fd99e02c2bfe7c9d72537a7af7fdd2690f
+SHA512 (rust-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 8e4c8a1b7d22294e3772955bd3ea10f3851aabcec86c2b428e00d7b5c617fdda13442ee334ced75217930da6145d4af97381c9f7648e2c2b1a929e6375dd9897
+Size (rust-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 169020592 bytes
+BLAKE2s (rust-1.93.1-armv7-unknown-linux-gnueabihf.tar.gz) = 4414141b84fff7b2d57ceb9dac12a34fc395eceba23640539b55b093365ffd87
+SHA512 (rust-1.93.1-armv7-unknown-linux-gnueabihf.tar.gz) = 14b6680d8294dedb2a79d954c36796c1b0c154fb32c6e96b1003aba3984faf434725fa8fb7b29eab7e418cccb644c10d8ae5d9b87609ee7110d5b8fafbd89eee
+Size (rust-1.93.1-armv7-unknown-linux-gnueabihf.tar.gz) = 428181629 bytes
+BLAKE2s (rust-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 8d015d036ac2610e73d0dad3165c1f026bcda3a7c2bcb18e191c20c17380752f
+SHA512 (rust-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 714b49df36f8d7576d572f4319248241f559e4974fb51805053d2c668816730b820a9a4c631274b7a6acc8ba84ab6978bbd823c55ee11579a76a0b0dc66e3087
+Size (rust-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 171401360 bytes
+BLAKE2s (rust-1.93.1-i586-unknown-netbsd.tar.xz) = 5e8dc4147ab56e6deebe65ecf13958d9f3ec92ec9beeb902c7a9b15aaa013ca7
+SHA512 (rust-1.93.1-i586-unknown-netbsd.tar.xz) = 3684db056547e775450297917a9b9306c0d9502da5390ed700e04cdc543b11a1be583a32d1767eb6008f908eccb56e7af8f01c20534e7631f55f78f379486aa0
+Size (rust-1.93.1-i586-unknown-netbsd.tar.xz) = 232318896 bytes
+BLAKE2s (rust-1.93.1-i686-unknown-linux-gnu.tar.gz) = cde86c634105d76512aee8b6d5fe1ffec76547a32859ce201adad4b9232c6716
+SHA512 (rust-1.93.1-i686-unknown-linux-gnu.tar.gz) = 49698872bd436ebfd9b25d43fdf43857c06a0aa8099ecc1cee29872cbfe41fcda6e93aaabefd8efb8b9857637c95ad6e8bb490a92278604f5f2de533e23c4d9e
+Size (rust-1.93.1-i686-unknown-linux-gnu.tar.gz) = 505663577 bytes
+BLAKE2s (rust-1.93.1-powerpc-unknown-netbsd.tar.xz) = 7e048eef2c195d90074404225a79b93d6c9cd27499d8f48ac0caf04f6d39084b
+SHA512 (rust-1.93.1-powerpc-unknown-netbsd.tar.xz) = 4c88e730af4e1030e72f646213c355a3ba729e5944bbd5f142403649188ea51ed7baff53dde6266721c1e22f1f342d5c1d08ef3faab24623f52033cade65f71e
+Size (rust-1.93.1-powerpc-unknown-netbsd.tar.xz) = 116419424 bytes
+BLAKE2s (rust-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = d693dd6da9c2372660dc84a6c4c8317f56b978a5f803ab54a2c2ca4e85c64693
+SHA512 (rust-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = 591e6e2ea7206dc8f0e75f108aaf09fbea39de8e52dc7df97ac9d3ba14ca8cba09e9e34a25dffcec38c728ce3d831efd566bfd58bac6629739405cbdb680431c
+Size (rust-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = 226861692 bytes
+BLAKE2s (rust-1.93.1-sparc64-unknown-netbsd.tar.xz) = 199fa7be5bed6e63ae5b58c15c13d26796334aebb7e2f94c1aa1fa931e1ff8df
+SHA512 (rust-1.93.1-sparc64-unknown-netbsd.tar.xz) = f0e228a949ebffbb7a683be007a7e0bc56f7c739fd4e81d6e9fc078daee0c2ec4c7b146568e38b6963cfc9fe4bdaeabc283b93221c74fd9ac2dc926bc6b62fe7
+Size (rust-1.93.1-sparc64-unknown-netbsd.tar.xz) = 204802412 bytes
+BLAKE2s (rust-1.93.1-x86_64-apple-darwin.tar.gz) = 9b120fea3fe39fa4c035e9269fadd5a949374f897e83137af856aebd6ab0977a
+SHA512 (rust-1.93.1-x86_64-apple-darwin.tar.gz) = d5689f4cc9ddf3eb15bbdab5ebbaa274431fcc34863dc963041b6be767b8c9c9dd145ae0a542f64ab853d59e1f8fddad7bda7d8b7dae98aad831e3ee5a8ffbc5
+Size (rust-1.93.1-x86_64-apple-darwin.tar.gz) = 335166016 bytes
+BLAKE2s (rust-1.93.1-x86_64-unknown-freebsd.tar.gz) = 6227131a3bae4ff1b8a6f7d0acdfb2f493dc80b487d4a37249d561e1e27c7f6c
+SHA512 (rust-1.93.1-x86_64-unknown-freebsd.tar.gz) = c6d9d9064f51bcdab4e391cbcbd2b2ce38c9781a689cbee890192cccf1e162c5087ebe1f30750d6b255d631fc03f1f4806145764126ea97df84833128d1e37b4
+Size (rust-1.93.1-x86_64-unknown-freebsd.tar.gz) = 388358160 bytes
+BLAKE2s (rust-1.93.1-x86_64-unknown-illumos.tar.gz) = 50da6a9367cedc9453a501a3840ccab4326eee63594de32466bb313b91dc38c8
+SHA512 (rust-1.93.1-x86_64-unknown-illumos.tar.gz) = 9897f2064cfa3f6bd6fa2f020bd6af97afc69133712ecdd52fbf187305d46a1e890d763a2ffa0f169ded8ddd95e3a9cefe68e02d0239ef3c7ca3853921fc88e6
+Size (rust-1.93.1-x86_64-unknown-illumos.tar.gz) = 253857714 bytes
+BLAKE2s (rust-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = a8c1a2896e879526811c7c7e5101bb01046b59f213ac4ebfad1bd6290989d15d
+SHA512 (rust-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = d5db54ebca4b7c94237cf700340d789438ffa87df0739e63f60d05d61117861abafccbccdc6d57e374f4571b4e5a66270f411b5f8bba878ae7fbb0d32d32597c
+Size (rust-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = 374862018 bytes
+BLAKE2s (rust-1.93.1-x86_64-unknown-netbsd.tar.xz) = b786fd3acf128a7a21e9c5594304418b455f77e7fa57749fb3f16b8b96047eba
+SHA512 (rust-1.93.1-x86_64-unknown-netbsd.tar.xz) = 75f00ccb92a6415dceea71759b8f2216b5e8c4c5a1cb2443ce2793df76c68b0b2ab63a867596661a891fe9cad87e0af0ed157e641f6c0a46f30e70d3401801e8
+Size (rust-1.93.1-x86_64-unknown-netbsd.tar.xz) = 223861472 bytes
+BLAKE2s (rust-std-1.93.1-aarch64-apple-darwin.tar.gz) = 5977adef459bb984ebc1ac6863866ae3bb6df6f160d4c755005388403b45dcb5
+SHA512 (rust-std-1.93.1-aarch64-apple-darwin.tar.gz) = 7f0c4e8092f8c24d631275bff65a2de402aa7c56b3737f125485d090e45d39ca50ada32bef7ef9d2217239bba8862f1dfece3a9a0a1db6e22fff1fb7f4c4e9dc
+Size (rust-std-1.93.1-aarch64-apple-darwin.tar.gz) = 46415350 bytes
+BLAKE2s (rust-std-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 759fdb8bba55c99a1d611966c4617f5cf0e76658cfd67fc11238a6e1c3eff4a6
+SHA512 (rust-std-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = bf11f08231d150aa18bd27810e1256193e7e0801ac390fbeff3d572410c192e6a4cb950af36333373597c7acffe1bea72f26af07aa13f109051b834f1b743d75
+Size (rust-std-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 50810024 bytes
+BLAKE2s (rust-std-1.93.1-aarch64-unknown-netbsd.tar.xz) = 61937bcf5ac1ab99912bcc043e6bb2f46b15b630b218171c14171fc127cd9967
+SHA512 (rust-std-1.93.1-aarch64-unknown-netbsd.tar.xz) = 25671ab28dca582470debb0e2bda1fb3c1871b6f662a8d4b78e85144814f604b383507a4691dc405905892492535e544af1753b91ba7fa72be615d5d0ed03fb5
+Size (rust-std-1.93.1-aarch64-unknown-netbsd.tar.xz) = 25921452 bytes
+BLAKE2s (rust-std-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 79ae797535bb9fc9c7f19dcbaef807ed94932d4f5c91b56a1d93546e22f80928
+SHA512 (rust-std-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 832b63e13f293c202768eac5f7082e0634a2daa042277756af79c4321931fe0fac027c5887f66de172271b2c9acea00891fe4d4c1a9779cc0410b9899e01f593
+Size (rust-std-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 26120204 bytes
+BLAKE2s (rust-std-1.93.1-arm-unknown-linux-gnueabihf.tar.gz) = 8401157296c98d9368bec96ac8f37d5cbee0c8114081bf9edf2d4d08abcea04a
+SHA512 (rust-std-1.93.1-arm-unknown-linux-gnueabihf.tar.gz) = fa8fe997610af04820447c77112110a15ba835d128fe448431a5c9d44c39f1e6c3d03a5f4bc0fd66b0621ed8946252a0fa750fb80c6d00a637ce5232a67c91ed
+Size (rust-std-1.93.1-arm-unknown-linux-gnueabihf.tar.gz) = 42164505 bytes
+BLAKE2s (rust-std-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 8e378b198a7fa48fb44e9b9e8ac351eecce6391ebdd1e195f7ca59291f714b4d
+SHA512 (rust-std-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 0cf5ddc9eda8df3a72f87132534ac577dd09ff73cd9b52a28b7d9bb5073fa7152d351a71047e131ce0bc8f33442ce0357ca100d2ce2787574f3290c316a8e1ce
+Size (rust-std-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 24165600 bytes
+BLAKE2s (rust-std-1.93.1-armv7-unknown-linux-gnueabihf.tar.gz) = 8802fa037d227cd685a733801b356ec10a835a43bbc5df2cbabe85ff28d43fe9
+SHA512 (rust-std-1.93.1-armv7-unknown-linux-gnueabihf.tar.gz) = ba361f060576cd3ec2e2fdf49fd8d549dfacd9acc5cdd7c7a1caaef180f5bb55dc763ae731343d685cf2079c9ab7d8e8459d20a3252258bc5df0aca3a09b4677
+Size (rust-std-1.93.1-armv7-unknown-linux-gnueabihf.tar.gz) = 43720271 bytes
+BLAKE2s (rust-std-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = cd52e3efa35f62c1a1ed26c822611dc880a11cf8dbf9d13b4091dccee5d823c2
+SHA512 (rust-std-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 50117d57a581199568387132a141e7477630d47c823dffed04b1100e45acfe5cd3f81efc350200bb5a630935d40fc096c212c94e7e252251ab59cd8a98ae81a8
+Size (rust-std-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 25128608 bytes
+BLAKE2s (rust-std-1.93.1-i586-unknown-netbsd.tar.xz) = bf56edc15b8a90bcc49a307aaa1d968ef7a0bb3dd0e105a1701a79ded0ad3458
+SHA512 (rust-std-1.93.1-i586-unknown-netbsd.tar.xz) = c3945b02e7fb13a139cbeafd0eb7d56153a66ce93f7d5a985a4d0dc2bc46f2c2732eead6809717fdada0f6cf186ebe284985100d6b64c8aafaee4c507849f8ac
+Size (rust-std-1.93.1-i586-unknown-netbsd.tar.xz) = 26740796 bytes
+BLAKE2s (rust-std-1.93.1-i686-unknown-linux-gnu.tar.gz) = f01d3699df1284991b5be9b4d1a6e98f2ce561c5bbf17f6925c82471c144d442
+SHA512 (rust-std-1.93.1-i686-unknown-linux-gnu.tar.gz) = 8eb16d1b1b95bacacd00c3bfc80f66400388fd6125185ba8ede2435449efe182adf7aec325165236480cc61d626c5a1325030290b62072916f3fe1ff69324edb
+Size (rust-std-1.93.1-i686-unknown-linux-gnu.tar.gz) = 46463737 bytes
+BLAKE2s (rust-std-1.93.1-powerpc-unknown-netbsd.tar.xz) = a30bf47a8c96452357120b34a370453659ebdd2106a8ae93400da43f7395654b
+SHA512 (rust-std-1.93.1-powerpc-unknown-netbsd.tar.xz) = 7f488417cbe44cc31c19ab11d11f14c2c4cfd5934bf0ffe04e1baa3fec63d429ec08e31e22d05bad405736699da1834dba150b1610980819f6112d7f6e427757
+Size (rust-std-1.93.1-powerpc-unknown-netbsd.tar.xz) = 24216220 bytes
+BLAKE2s (rust-std-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = f2f999cf59ed8d4411552644f7c3c41428e5270584fbdf2638515a3b7d693054
+SHA512 (rust-std-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = a60fd420ac50b4e34da82a8498ba4d1c9ecb3ad88a686c5e751df52856835acd3bec19d169818383b53a408b494fd63723a7b4cce11ac299622da232a999d727
+Size (rust-std-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = 24411720 bytes
+BLAKE2s (rust-std-1.93.1-sparc64-unknown-netbsd.tar.xz) = 688f93f95296fcaebac0c990f67881ab40831f02471bbc87e4fd4423570422a9
+SHA512 (rust-std-1.93.1-sparc64-unknown-netbsd.tar.xz) = 4380eb1d87c643798b8b5932c1d43118814d914420e791f5dc97c13baf23beeaa5b9d5c85d73d7c022d23e2a4a0ea03a1279da090d0238e88f3f918572686592
+Size (rust-std-1.93.1-sparc64-unknown-netbsd.tar.xz) = 24117700 bytes
+BLAKE2s (rust-std-1.93.1-x86_64-apple-darwin.tar.gz) = 7a8e3adb937dca61249558d849d1fdcb30e44b5fd77b83a5899ff3498a6ff0b3
+SHA512 (rust-std-1.93.1-x86_64-apple-darwin.tar.gz) = 30e1c7e14a8e47e257ef2993ab52579b10675625003134babf2284dec95d70047532fe5e5469fc796237e644a4a7400fa4c1774574bf5cf9256c86f91047a5e5
+Size (rust-std-1.93.1-x86_64-apple-darwin.tar.gz) = 48858311 bytes
+BLAKE2s (rust-std-1.93.1-x86_64-unknown-freebsd.tar.gz) = 7d32a45205b3bac3476b60e31f5718915e9f9eba5ac5cbe3be856f43cf2fc366
+SHA512 (rust-std-1.93.1-x86_64-unknown-freebsd.tar.gz) = 96389b676cf53ca060be308b6c10c9c4619a76a444ff151cad1a1a66746544e98cb0e8b84fd2b183eb35dbcd3b8c161792e34db2309b622c4969f2224cd2d94f
+Size (rust-std-1.93.1-x86_64-unknown-freebsd.tar.gz) = 49785750 bytes
+BLAKE2s (rust-std-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = 255aa3feeac5ebe21e27408e0c4284d2565356c3cd8120a0dbce9369b3dd00a0
+SHA512 (rust-std-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = 0f30f30a3fbd6a1870d2c4c75687bdcace9e98f530bbea119141b9d57f5246e47e02fd202ff76ed987619e287b04f83219a299e96bcffc71af86d075a17113bc
+Size (rust-std-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = 52807215 bytes
+BLAKE2s (rust-std-1.93.1-x86_64-unknown-netbsd.tar.xz) = a9c90e69027c927088fa98049d960167c16e71f4bcddec8ba1591eb703bc30f3
+SHA512 (rust-std-1.93.1-x86_64-unknown-netbsd.tar.xz) = cbcb3ad81d3b12e81d8cba213fd14501f2b0e2050081192f75150de6a6bdb087c7267e791744c11c7aaa04fa167f2d84223077239f49981a688352a25e86aa2f
+Size (rust-std-1.93.1-x86_64-unknown-netbsd.tar.xz) = 27041256 bytes
+BLAKE2s (rustc-1.94.1-src.tar.gz) = 3501305cad1b7e7c6b2c3d829843653e35673e83ddc4bd2b1e352312515d80ba
+SHA512 (rustc-1.94.1-src.tar.gz) = 829ae7c0c108102d613c486863d83dec94a572182237214ac16aa07b9417401c179721f5710e3977fc51d3ff6d79e9c2a5a01ade0a68e9e0d711ee31bf786f83
+Size (rustc-1.94.1-src.tar.gz) = 651725417 bytes
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f6b18a54dd8c991f6304df35a59fee3d55b46ed3
SHA1 (patch-compiler_rustc__llvm_build.rs) = 3acef995e3038a98b29b31b9bdd43286b1ac29f7
-SHA1 (patch-compiler_rustc__target_src_spec_Targets_sparc64__unknown__netbsd.rs) = 416d369e197f2eba6b0e6dd321b727f0f64ff159
-SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = f6805317abaf61fa5e713af0b3599945a93a751a
-SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
+SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 4db00d8abecd8f343e3c22c272a8a4e1f9228532
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a465dc5c8409202df63327a911b3482a0a00d166
SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs) = 620eaf74c1dd030973af53dfe4f9aa998be5b123
SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs) = 1a02f2dd61a5f9cc4be1f66ac3404c961810c731
-SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = 0c5b7c31abe514e3394b910c6e601e40ebbd45c1
+SHA1 (patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs) = 1862a68a0c835dd998267fd771a70574f0adab2e
+SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = 5380b0052dad5316663be76269cbac84830b6c97
SHA1 (patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs) = 7deeb7d1d3306e96891dec144ac90398b88c6ad4
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee76da9bb768f5b3d9
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 8b18e1dbde59f3e8f20e93c7669618b2c7a13294
-SHA1 (patch-library_std_src_sys_fs_unix.rs) = c5eb48f177f6c1b50903fb6690177058851c526c
SHA1 (patch-src_bootstrap_bootstrap.py) = fb89adaaf01f558d636734db5d778af4a3c67fd6
SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
-SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = 00ceb941adbdd8fdb96f75dbcc50c2d2b3e55842
+SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = 5ecf4e371fa48bca72fa5b0adb55152c906bd813
SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = b7ce18d045c2ef250817ee4b6ed57e0524d99e71
+SHA1 (patch-src_bootstrap_src_core_sanity.rs) = 3960db30047a0a97c5f2ae28d4149b00584980c9
SHA1 (patch-src_bootstrap_src_lib.rs) = 735a3f6cbb3054200dd55eebce6e9acbd285f51e
SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 446acdd51fb6ddcba733371263aa2f9949299d31
SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
@@ -126,7 +132,7 @@ SHA1 (patch-src_llvm-project_llvm_includ
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) = 333ec513b9b94750b2424a7c1b21c809e6ea25b8
-SHA1 (patch-src_tools_rust-installer_install-template.sh) = 6984546c34a2e4d55a6dbe59baa0d4958184e0b7
+SHA1 (patch-src_tools_rust-installer_install-template.sh) = f222961e0fd4bac2f680f90d34a3e01864e3cebb
SHA1 (patch-tests_assembly-llvm_targets_targets-elf.rs) = e92c0b7734008ccabc7b7fb8988f67192946d66d
SHA1 (patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs) = d4d9288cb199af9bc7e321fbd2b42860aed954ec
SHA1 (patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 36d927a0c3fd6ef8d211da5389a981e077aedc29
@@ -141,7 +147,14 @@ SHA1 (patch-vendor_libc-0.2.171_src_unix
SHA1 (patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 3127715d2eb1e0ce148d67323b25dd0bc07b67ad
SHA1 (patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs) = 9365cab6fd25dd077ed56f6105cde22a4a3356dd
SHA1 (patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = bcfaa5a86f5a5d837cc467dd5ac62434fcedc518
-SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 393f7a6ad565bf5ceaa03e12d7b5eecd9bef467a
+SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e7dc8f13f851e9423f126de7ffce6de5ecb7b74a
+SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 866d84d8ff7740ca644fb8d63eb3289704b2746f
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs) = 1e1b495b23362c79fbceb74797a18ea7038fe2e0
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 4a9ba4f47ae75318862f501160c25bb4ccf7dc7d
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = b2508d2e02883f69aba62e00490e2dd376ede2fd
+SHA1 (patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs) = 863eb1a9cedde9da05a84cef6f0e34d56ba3d4c2
+SHA1 (patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs) = bd77c9b79394a060e131fd8250f54421db4fc2ba
+SHA1 (patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 5dbd71a9ba8f0a5ee28727a7bb8ab3d2c9b9e590
SHA1 (patch-vendor_line-index-0.1.2_src_lib.rs) = 30aa5c82630ea0e8969abb527c11640712efba1e
SHA1 (patch-vendor_lzma-sys-0.1.20_config.h) = 4849052ddb2f04f539fd7060fc1b43cc3acf99c4
SHA1 (patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs) = 3e17e9f068afe5e812d10bf57fd3f6d4c21baf0b
@@ -151,17 +164,19 @@ SHA1 (patch-vendor_memchr-2.7.4_src_memm
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) = 8fc746574f16cd3294edce99beffc3e8c03a089b
SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c) = 1373d2e4ab609956e0e51ca3d900861caf3ee70d
-SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs) = b2c539ecafce940e5b8dcdb5951e15424a385bf1
+SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs) = c3260bfdd670c31845189fcb6b4ed19385a03b2a
SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf) = 49803c889864dbeccba92095b9fa6f104ff0180a
SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c) = 895b5f4d80fb714973f6d6fb1a39d89907e4976d
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs) = 4c0f2796e28908d5d42749b03d210c649659cf6f
-SHA1 (patch-vendor_openssl-src-300.5.2+3.5.2_openssl_Configurations_10-main.conf) = b75d0f78e870b724b0bff5edf0dbb77d88d6d55b
-SHA1 (patch-vendor_openssl-src-300.5.2+3.5.2_openssl_crypto_aria_aria.c) = 2dabfb3827484b01809b97d9ab20ecf388475626
-SHA1 (patch-vendor_openssl-src-300.5.2+3.5.2_src_lib.rs) = 0222fdb10e79ea4cf47c56c7cc1a3d0128cb7565
+SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs) = 98e99556c19c055f696f0d9bfbce4aaf207b1640
+SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf) = cf8ea96ca5e47d8b236e7de9d766badcda7494aa
+SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c) = 3d3c52cad4faa7af77513eaab26b45ebfbcde906
+SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs) = 69420384e4716666011bd2c183aa1dc282f24d85
SHA1 (patch-vendor_openssl-sys-0.9.107_build_find__normal.rs) = b3de2b9137882e3612291057c1b7793a27de760f
SHA1 (patch-vendor_openssl-sys-0.9.107_build_main.rs) = 46627c013821166688d16d97f6f8ff4ccb552241
SHA1 (patch-vendor_openssl-sys-0.9.109_build_find__normal.rs) = 96b7b6067e857ef1ef4c8b832dcbe13496e21ca4
SHA1 (patch-vendor_openssl-sys-0.9.109_build_main.rs) = bc892cf8e13b6b8c6e30804fa41696bcedbabde3
+SHA1 (patch-vendor_openssl-sys-0.9.111_build_find__normal.rs) = 7548f8ef9ae7e1771035814398d72bec867e59a7
+SHA1 (patch-vendor_openssl-sys-0.9.111_build_main.rs) = 87e4f6c55eaf88ebbc81ff927991d013bfca5a38
SHA1 (patch-vendor_openssl-sys-0.9.92_build_find__normal.rs) = 0ed143b603eea7c0bddf39e97916608c58978202
SHA1 (patch-vendor_openssl-sys-0.9.92_build_main.rs) = 842ad74284518fbe8ff65222f7f6f81fb6381e49
SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
Index: pkgsrc/lang/rust/do-cross.mk
diff -u pkgsrc/lang/rust/do-cross.mk:1.16 pkgsrc/lang/rust/do-cross.mk:1.17
--- pkgsrc/lang/rust/do-cross.mk:1.16 Mon Aug 25 17:51:11 2025
+++ pkgsrc/lang/rust/do-cross.mk Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: do-cross.mk,v 1.16 2025/08/25 17:51:11 wiz Exp $
+# $NetBSD: do-cross.mk,v 1.17 2026/04/02 19:06:34 wiz Exp $
# Do all the NetBSD cross builds
# Collect the bootstrap kits in dist/
@@ -14,6 +14,7 @@ SHORT_TARGETS+= arm64_be
SHORT_TARGETS+= i386
SHORT_TARGETS+= riscv64
SHORT_TARGETS+= mipsel # produces mips32 (not mips1) executables
+#SHORT_TARGETS+= m68k
# Conditional local overrides of ROOT.* variables:
.sinclude "local-roots.mk"
@@ -29,6 +30,7 @@ ROOT.arm64_be?= /u/evbarm64eb
ROOT.i386?= /u/i386
ROOT.mipsel?= /u/mipsel
ROOT.riscv64?= /u/riscv64
+ROOT.m68k?= /u/m68k
# Mapping to GNU triple
G_TGT.armv7= armv7--netbsdelf-eabihf
@@ -40,6 +42,7 @@ G_TGT.arm64_be= aarch64_be--netbsd
G_TGT.i386= i486--netbsdelf
G_TGT.mipsel= mipsel--netbsd
G_TGT.riscv64= riscv64--netbsd
+G_TGT.m68k= m68k--netbsdelf
# Mapping to rust's TARGET specification
TGT.armv7= armv7-unknown-netbsd-eabihf
@@ -51,6 +54,7 @@ TGT.arm64_be= aarch64_be-unknown-netbsd
TGT.i386= i586-unknown-netbsd
TGT.mipsel= mipsel-unknown-netbsd
TGT.riscv64= riscv64gc-unknown-netbsd
+TGT.m68k= m68k-unknown-netbsd
# Optional target tweak for bootstrap files
#TT.powerpc= powerpc-unknown-netbsd90
@@ -59,25 +63,31 @@ WRKDIR= ${.CURDIR}/work
SCRIPTS= ${WRKDIR}/scripts
#DEBUG= echo
+ECHO?= echo
# Make list of make targets
.for st in ${SHORT_TARGETS}
MTGTS+= do-${st}
.endfor
+.PHONY: all
+
all: ${MTGTS}
# Define the individual build targets, used above
.for st in ${SHORT_TARGETS}
-CA.${st}=--host=${TGT.${st}}
-CA.${st}+=--target=${TGT.${st}}
-CA.${st}+=--set=target.${TGT.${st}}.cc=${SCRIPTS}/gcc-wrap
-CA.${st}+=--set=target.${TGT.${st}}.cxx=${SCRIPTS}/c++-wrap
-CA.${st}+=--set=target.${TGT.${st}}.linker=${SCRIPTS}/gcc-wrap
-CA.${st}+=--set=target.${TGT.${st}}.ar=${ROOT.${st}}/tools/bin/${G_TGT.${st}}-ar
+CA.${st}= --host=${TGT.${st}}
+CA.${st}+= --target=${TGT.${st}}
+CA.${st}+= --set=target.${TGT.${st}}.cc=${SCRIPTS}/gcc-wrap
+CA.${st}+= --set=target.${TGT.${st}}.cxx=${SCRIPTS}/c++-wrap
+CA.${st}+= --set=target.${TGT.${st}}.linker=${SCRIPTS}/gcc-wrap
+CA.${st}+= --set=target.${TGT.${st}}.ar=${ROOT.${st}}/tools/bin/${G_TGT.${st}}-ar
+
+.PHONY: do-${st}
+
do-${st}:
mkdir -p dist
- @echo "=======> Cross-building rust for ${st}"
+ @${ECHO} "=======> Cross-building rust for ${st}"
${DEBUG} make -f Makefile clean
${DEBUG} env \
CROSS_ROOT=${ROOT.${st}} \
@@ -95,13 +105,13 @@ do-${st}:
src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
if [ ! -f "$${tgt}" ]; then \
- echo ln $${src} $${tgt}; \
+ ${ECHO} ln $${src} $${tgt}; \
${DEBUG} ln $${src} $${tgt}; \
fi; \
done; \
src_comp=rust-src-${V_NOREV}.tar.xz; \
if [ ! -f dist/$${src_comp} ]; then \
- echo ln $${distdir}/$${src_comp} dist; \
+ ${ECHO} ln $${distdir}/$${src_comp} dist; \
${DEBUG} ln $${distdir}/$${src_comp} dist; \
fi
.endfor
Index: pkgsrc/lang/rust/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.53 pkgsrc/lang/rust/options.mk:1.54
--- pkgsrc/lang/rust/options.mk:1.53 Thu Feb 12 15:30:12 2026
+++ pkgsrc/lang/rust/options.mk Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.53 2026/02/12 15:30:12 gutteridge Exp $
+# $NetBSD: options.mk,v 1.54 2026/04/02 19:06:34 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
@@ -76,6 +76,14 @@ CONFIGURE_ARGS+= --llvm-root=${BUILDLINK
CONFIGURE_ARGS+= --set rust.lld=false
.endif
+# Rust bumps into NetBSD's limit of 256 TLS keys per process, at least
+# on aarch64 with "fatal runtime error: out of TLS keys, aborting"
+# (for some incomprehensible reason this isn't triggered on NetBSD/amd64 10.1)
+.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64*}
+# So try to bump that per-process limit:
+MAKE_ENV+= PTHREAD_KEYS_MAX=512
+.endif
+
#
# Link cargo statically against "native" libraries.
# (openssl and curl specifically).
@@ -93,7 +101,7 @@ BUILDLINK_API_DEPENDS.curl+= curl>=7.67
# where the linking of rust-analyzer fails because it's now too big
# for 24-bit word-based PC-relative relocation offsets.
# Apply on or for powerpc:
-.if ${MACHINE_PLATFORM:M*-powerpc} || \
+.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
(!empty(TARGET) && ${TARGET:Mpowerpc-*})
CONFIGURE_ARGS+= --tools="cargo,clippy,rustdoc,rustfmt,analysis,src,wasm-component-ld"
# rust-analyzer dropped from list
Index: pkgsrc/lang/rust/files/gcc-wrap
diff -u pkgsrc/lang/rust/files/gcc-wrap:1.7 pkgsrc/lang/rust/files/gcc-wrap:1.8
--- pkgsrc/lang/rust/files/gcc-wrap:1.7 Tue Jan 13 20:48:23 2026
+++ pkgsrc/lang/rust/files/gcc-wrap Thu Apr 2 19:06:34 2026
@@ -37,6 +37,11 @@ else
powerpc*) # Now needed due to bloat
madd="-mlongcall"
;;
+ m68k-*) # needed due to exceeding 16-bit offsets
+ # ref.
+ # relocation truncated to fit: R_68K_PC16 against ...
+ madd="-mlong-jump-table-offsets"
+ ;;
esac
# We build both for -8 and -9 due to ABI differences,
# so can't just test $gnuarch... Yes, a vile hack.
Index: pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
diff -u pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs:1.21 pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs:1.22
--- pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs:1.21 Mon Aug 25 17:51:12 2025
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs Thu Apr 2 19:06:34 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.21 2025/08/25 17:51:12 wiz Exp $
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.22 2026/04/02 19:06:34 wiz Exp $
Do not use @rpath on Darwin.
Find external libunwind on Linux.
---- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2024-09-04 15:07:06.000000000 +0000
+--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2026-01-24 10:12:53.935808570 +0000
+++ compiler/rustc_codegen_ssa/src/back/linker.rs
-@@ -402,7 +402,7 @@ impl<'a> GccLinker<'a> {
+@@ -454,7 +454,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 {
@@ -14,14 +14,14 @@ Find external libunwind on Linux.
rpath.push(out_filename.file_name().unwrap());
self.link_arg("-install_name").link_arg(rpath);
}
-@@ -528,6 +528,10 @@ impl<'a> Linker for GccLinker<'a> {
+@@ -596,6 +596,10 @@ impl<'a> Linker for GccLinker<'a> {
}
fn link_dylib_by_name(&mut self, name: &str, verbatim: bool, as_needed: bool) {
-+ if self.sess.target.os.contains("linux") && name == "unwind" {
++ if self.sess.target.llvm_target.contains("linux") && name == "unwind" {
+ self.link_arg("-R@PREFIX@/lib");
+ self.link_arg("-L@PREFIX@/lib");
+ }
- if self.sess.target.os == "illumos" && name == "c" {
+ if self.sess.target.os == Os::Illumos && name == "c" {
// libc will be added via late_link_args on illumos so that it will
// appear last in the library search order.
Index: pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
diff -u pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs:1.6 pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs:1.7
--- pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs:1.6 Mon Aug 25 17:51:12 2025
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_base_netbsd.rs,v 1.6 2025/08/25 17:51:12 wiz Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_base_netbsd.rs,v 1.7 2026/04/02 19:06:34 wiz Exp $
For the benefit of powerpc, when libatomic-links is installed,
search the directory containing the symlinks to -latomic.
@@ -6,8 +6,8 @@ search the directory containing the syml
--- compiler/rustc_target/src/spec/base/netbsd.rs.orig 2024-01-06 19:57:14.887897867 +0000
+++ compiler/rustc_target/src/spec/base/netbsd.rs
@@ -1,12 +1,23 @@
--use crate::spec::{RelroLevel, TargetOptions, cvs};
-+use crate::spec::{Cc, Lld, LinkerFlavor, RelroLevel, TargetOptions, cvs};
+-use crate::spec::{Os, RelroLevel, TargetOptions, cvs};
++use crate::spec::{Cc, Lld, LinkerFlavor, Os, RelroLevel, TargetOptions, cvs};
pub(crate) fn opts() -> TargetOptions {
+ let add_linker_paths =
@@ -21,7 +21,7 @@ search the directory containing the syml
+ add_linker_paths
+ );
TargetOptions {
- os: "netbsd".into(),
+ os: Os::NetBsd,
dynamic_linking: true,
families: cvs!["unix"],
no_default_libraries: false,
Index: pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
diff -u pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs:1.17 pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs:1.18
--- pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs:1.17 Thu Apr 18 09:29:42 2024
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs Thu Apr 2 19:06:34 2026
@@ -1,10 +1,18 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.18 2026/04/02 19:06:34 wiz Exp $
-Add entry for NetBSD/mips64el.
+Add entry for NetBSD/mips64el and NetBSD/m68k
---- compiler/rustc_target/src/spec/mod.rs.orig 2024-01-13 14:20:59.236278792 +0000
+--- compiler/rustc_target/src/spec/mod.rs.orig 2026-02-11 07:30:54.000000000 +0000
+++ compiler/rustc_target/src/spec/mod.rs
-@@ -1532,6 +1532,7 @@ supported_targets! {
+@@ -1440,6 +1440,7 @@ supported_targets! {
+ ("loongarch64-unknown-linux-musl", loongarch64_unknown_linux_musl),
+ ("m68k-unknown-linux-gnu", m68k_unknown_linux_gnu),
+ ("m68k-unknown-none-elf", m68k_unknown_none_elf),
++ ("m68k-unknown-netbsd", m68k_unknown_netbsd),
+ ("csky-unknown-linux-gnuabiv2", csky_unknown_linux_gnuabiv2),
+ ("csky-unknown-linux-gnuabiv2hf", csky_unknown_linux_gnuabiv2hf),
+ ("mips-unknown-linux-gnu", mips_unknown_linux_gnu),
+@@ -1529,6 +1530,7 @@ supported_targets! {
("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
("i586-unknown-netbsd", i586_unknown_netbsd),
("i686-unknown-netbsd", i686_unknown_netbsd),
Index: pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
diff -u pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs:1.7
pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs:1.8
--- pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs:1.7 Mon Aug 25 17:51:12 2025
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs Thu Apr 2 19:06:34 2026
@@ -1,12 +1,15 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs,v 1.7 2025/08/25 17:51:12 wiz Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs,v 1.8 2026/04/02 19:06:34 wiz Exp $
Provide a mips64el target with N32, suitable for NetBSD/mips64el.
--- compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs.orig 2024-01-13 14:16:30.122042614 +0000
+++ compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,32 @@
++//! A target tuple for NetBSD/mips64
++
+use rustc_abi::Endian;
-+use crate::spec::{base, Target, TargetOptions};
++
++use crate::spec::{Abi, Arch, Target, TargetMetadata, TargetOptions, base};
+
+pub(crate) fn target() -> Target {
+ let mut base = base::netbsd::opts();
@@ -15,19 +18,20 @@ Provide a mips64el target with N32, suit
+
+ Target {
+ llvm_target: "mipsel-unknown-netbsd".into(),
-+ metadata: crate::spec::TargetMetadata {
-+ description: None,
-+ tier: None,
-+ host_tools: None,
-+ std: None,
++ metadata: TargetMetadata {
++ description: Some("NetBSD/mips64 with n32 ABI".into()),
++ tier: Some(3),
++ host_tools: Some(false),
++ std: Some(false),
+ },
+ pointer_width: 32,
+ data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
-+ arch: "mips".into(),
++ arch: Arch::Mips64,
+ options: TargetOptions {
-+ abi: "n32".into(),
-+ features: "+soft-float,+abi=n32".into(),
++ abi: Abi::ElfV2,
+ endian: Endian::Little,
++ features: "+soft-float,+abi=n32".into(),
++ llvm_abiname: "n32".into(),
+ mcount: "__mcount".into(),
+ ..base
+ },
Index: pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_install.rs
diff -u pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_install.rs:1.4 pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_install.rs:1.5
--- pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_install.rs:1.4 Tue Jan 13 20:48:23 2026
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_build__steps_install.rs Thu Apr 2 19:06:34 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_bootstrap_src_core_build__steps_install.rs,v 1.4 2026/01/13 20:48:23 wiz Exp $
+$NetBSD: patch-src_bootstrap_src_core_build__steps_install.rs,v 1.5 2026/04/02 19:06:34 wiz Exp $
+
+Drop "docs" from installation (takes forever), add "rust".
--- src/bootstrap/src/core/build_steps/install.rs.orig 2025-10-28 16:34:16.000000000 +0000
+++ src/bootstrap/src/core/build_steps/install.rs
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
diff -u pkgsrc/lang/rust/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs:1.4 pkgsrc/lang/rust/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs:1.5
--- pkgsrc/lang/rust/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs:1.4 Sat Oct 18 17:14:36 2025
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs Thu Apr 2 19:06:35 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs,v 1.4 2025/10/18 17:14:36 he Exp $
+$NetBSD: patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs,v 1.5 2026/04/02 19:06:35 wiz Exp $
Add the various NetBSD targets.
---- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2025-05-18 13:26:41.970702318 +0000
+--- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
+++ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
@@ -239,6 +239,8 @@ impl Build {
"aarch64-unknown-freebsd" => "BSD-generic64",
@@ -31,15 +31,18 @@ Add the various NetBSD targets.
"i686-apple-darwin" => "darwin-i386-cc",
"i686-linux-android" => "linux-elf",
"i686-pc-windows-gnu" => "mingw",
-@@ -264,6 +269,7 @@ impl Build {
+@@ -264,8 +269,10 @@ impl Build {
"i686-unknown-freebsd" => "BSD-x86-elf",
"i686-unknown-linux-gnu" => "linux-elf",
"i686-unknown-linux-musl" => "linux-elf",
+ "i686-unknown-netbsd" => "BSD-x86-elf",
"loongarch64-unknown-linux-gnu" => "linux-generic64",
"loongarch64-unknown-linux-musl" => "linux-generic64",
++ "m68k-unknown-netbsd" => NetBSD-generic32,
"mips-unknown-linux-gnu" => "linux-mips32",
-@@ -274,9 +280,11 @@ impl Build {
+ "mips-unknown-linux-musl" => "linux-mips32",
+ "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
+@@ -274,9 +281,11 @@ impl Build {
"mips64el-unknown-linux-muslabi64" => "linux64-mips64",
"mipsel-unknown-linux-gnu" => "linux-mips32",
"mipsel-unknown-linux-musl" => "linux-mips32",
@@ -51,7 +54,7 @@ Add the various NetBSD targets.
"powerpc64-unknown-freebsd" => "BSD-generic64",
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
"powerpc64-unknown-linux-musl" => "linux-ppc64",
-@@ -284,8 +292,10 @@ impl Build {
+@@ -284,8 +293,10 @@ impl Build {
"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
"powerpc64le-unknown-linux-musl" => "linux-ppc64le",
"riscv64gc-unknown-linux-gnu" => "linux-generic64",
Index: pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh
diff -u pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh:1.14 pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh:1.15
--- pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh:1.14 Thu Apr 18 09:29:42 2024
+++ pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.14 2024/04/18 09:29:42 pin Exp $
+$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.15 2026/04/02 19:06:34 wiz Exp $
No logging to 'install.log'.
Do not create 'uninstall.sh'.
@@ -38,8 +38,8 @@ should do just fine.
- local _command=`echo $_directive | cut -f1 -d:`
- local _file=`echo $_directive | cut -f2 -d:`
-+ local _command=${_directive%%:*}
-+ local _file=${_directive#*:}
++ local _command="${_directive%%:*}"
++ local _file="${_directive#*:}"
# Sanity checks
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
@@ -49,119 +49,12 @@ should do just fine.
- local _command=`echo $_directive | cut -f1 -d:`
- local _file=`echo $_directive | cut -f2 -d:`
-+ local _command=${_directive%%:*}
-+ local _file=${_directive#*:}
++ local _command="${_directive%%:*}"
++ local _file="${_directive#*:}"
# Sanity checks
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
-@@ -551,36 +543,24 @@ install_components() {
- # Decide the destination of the file
- local _file_install_path="$_dest_prefix/$_file"
-
-- if echo "$_file" | grep "^etc/" > /dev/null
-- then
-- local _f="$(echo "$_file" | sed 's/^etc\///')"
-- _file_install_path="$CFG_SYSCONFDIR/$_f"
-- fi
--
-- if echo "$_file" | grep "^bin/" > /dev/null
-- then
-- local _f="$(echo "$_file" | sed 's/^bin\///')"
-- _file_install_path="$CFG_BINDIR/$_f"
-- fi
--
-- if echo "$_file" | grep "^lib/" > /dev/null
-- then
-- local _f="$(echo "$_file" | sed 's/^lib\///')"
-- _file_install_path="$CFG_LIBDIR/$_f"
-- fi
--
-- if echo "$_file" | grep "^share" > /dev/null
-- then
-- local _f="$(echo "$_file" | sed 's/^share\///')"
-- _file_install_path="$CFG_DATADIR/$_f"
-- fi
--
-- if echo "$_file" | grep "^share/man/" > /dev/null
-- then
-- local _f="$(echo "$_file" | sed 's/^share\/man\///')"
-- _file_install_path="$CFG_MANDIR/$_f"
-- fi
--
-+ case "$_file" in
-+ etc/*)
-+ local _f=${_file#"etc/"}
-+ _file_install_path="$CFG_DESTDIR_PREFIX/share/doc/cargo/$_f"
-+ ;;
-+ bin/*)
-+ local _f=${_file#"bin/"}
-+ _file_install_path="$CFG_BINDIR/$_f"
-+ ;;
-+ lib/*)
-+ local _f=${_file#"lib/"}
-+ _file_install_path="$CFG_LIBDIR/$_f"
-+ ;;
-+ share/man/*)
-+ local _f=${_file#"share/man/"}
-+ _file_install_path="$CFG_MANDIR/$_f"
-+ ;;
-+ share/doc/*)
- # HACK: Try to support overriding --docdir. Paths with the form
- # "share/doc/$product/" can be redirected to a single --docdir
- # path. If the following detects that --docdir has been specified
-@@ -591,14 +571,17 @@ install_components() {
- # contents of those directories are _not_ disjoint. Since this feature
- # is almost entirely to support 'make install' anyway I don't expect
- # this problem to be a big deal in practice.
-- if [ "$CFG_DOCDIR" != "<default>" ]
-- then
-- if echo "$_file" | grep "^share/doc/" > /dev/null
-- then
-- local _f="$(echo "$_file" | sed 's/^share\/doc\/[^/]*\///')"
-- _file_install_path="$CFG_DOCDIR/$_f"
-- fi
-- fi
-+ if [ "$CFG_DOCDIR" != "<default>" ]; then
-+ local _f=${_file#"share/doc/"*/}
-+ _file_install_path="$CFG_DOCDIR/$_f"
-+ fi
-+ ;;
-+ share/*)
-+ local _f=${_file#"share/"}
-+ _file_install_path="$CFG_DATADIR/$_f"
-+ ;;
-+ esac
-+
-
- # Make sure there's a directory for it
- make_dir_recursive "$(dirname "$_file_install_path")"
-@@ -615,16 +598,16 @@ install_components() {
-
- verbose_msg "copying file $_file_install_path"
-
-- maybe_backup_path "$_file_install_path"
--
-- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
-- then
-- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
-- run chmod 755 "$_file_install_path"
-- else
-+ local mode=644
-+ if test -x "$_src_dir/$_component/$_file"; then
-+ mode=755
-+ fi
-+ case "$_file" in
-+ bin/*) mode=755
-+ ;;
-+ esac
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
-- run chmod 644 "$_file_install_path"
-- fi
-+ run chmod $mode "$_file_install_path"
- critical_need_ok "file creation failed"
-
- # Update the manifest
-@@ -637,7 +620,6 @@ install_components() {
+@@ -628,7 +620,6 @@ install_components() {
verbose_msg "copying directory $_file_install_path"
@@ -169,7 +62,7 @@ should do just fine.
run cp -R "$_src_dir/$_component/$_file" "$_file_install_path"
critical_need_ok "failed to copy directory"
-@@ -986,7 +968,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
+@@ -977,7 +968,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
critical_need_ok "failed to write installer version"
# Install the uninstaller
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
diff -u pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1
pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.2
--- pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1 Tue Jan 13 20:48:23 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs Thu Apr 2 19:06:34 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2026/01/13 20:48:23 wiz Exp $
+$NetBSD: patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.2 2026/04/02 19:06:34 wiz Exp $
Unbreak this module.
@@ -8,79 +8,64 @@ for NetBSD/risc64 with this, whereas it
--- vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-11-02 16:57:14.244169978 +0000
+++ vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
-@@ -1,16 +1,16 @@
+@@ -1,28 +1,48 @@
-use PT_FIRSTMACH;
-+use crate::PT_FIRSTMACH;
-
+-
use crate::prelude::*;
++use crate::PT_FIRSTMACH;
pub type __greg_t = u64;
- pub type __cpu_simple_lock_nv_t = c_int;
- pub type __gregset = [__greg_t; _NGREG];
+-pub type __cpu_simple_lock_nv_t = c_int;
+-pub type __gregset = [__greg_t; _NGREG];
-pub type __fregset = [__freg; _NFREG];
-+pub type __fpregset = [__fpreg; _NFREG];
++pub type __cpu_simple_lock_nv_t = c_uint;
++pub type __gregset_t = [__greg_t; _NGREG];
++pub type __fregset_t = [__fpreg; _NFREG];
++
++s_no_extra_traits! {
++ pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++ }
++}
s! {
pub struct mcontext_t {
- pub __gregs: __gregset,
+- pub __gregs: __gregset,
- pub __fregs: __fpregset,
-+ pub __fpregs: __fpregset,
++ pub __gregs: __gregset_t,
++ pub __fregs: __fregset_t,
__spare: [crate::__greg_t; 7],
}
}
-@@ -22,6 +22,55 @@ s_no_extra_traits! {
- }
- }
+-s_no_extra_traits! {
+- pub union __fpreg {
+- pub u_u64: u64,
+- pub u_d: c_double,
+cfg_if! {
+ if #[cfg(feature = "extra_traits")] {
-+// use ::self::fmt;
-+// use ::self::hash;
-+ use core::marker::Copy;
-+ use core::clone::Clone;
-+ #[cfg(libc_union)]
+ impl PartialEq for __fpreg {
+ fn eq(&self, other: &__fpreg) -> bool {
-+ unsafe {
-+ self.u_64 == other.u_64
-+ || self.u_d == other.u_d
-+ }
++ unsafe { self.u_u64 == other.u_u64 || self.u_d == other.u_d }
+ }
+ }
-+ #[cfg(libc_union)]
+ impl Eq for __fpreg {}
-+ #[cfg(libc_union)]
-+ impl ::fmt::Debug for __fpreg {
-+ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ impl hash::Hash for __fpreg {
++ fn hash<H: hash::Hasher>(&self, state: &mut H) {
+ unsafe {
-+ f.debug_struct("__fpreg")
-+ .field("u_u64", &self.u_64)
-+ .field("u_d", &self.u_d)
-+ .finish()
++ self.u_u64.hash(state);
+ }
+ }
+ }
-+ #[cfg(libc_union)]
-+ impl ::hash::Hash for __fpreg {
-+ fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-+ unsafe {
-+ self.u_64.hash(state);
-+ self.u_d.hash(state);
-+ }
-+ }
-+ }
-+ #[cfg(libc_union)]
-+ impl ::Copy for __fpreg {}
-+ #[cfg(libc_union)]
-+ impl ::Clone for __fpreg {
-+ fn clone(&self) -> __fpreg {
-+ *self
-+ }
-+ }
-+ }
-+}
-+
-+
- pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
+ }
+ }
+
+-pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
++// gcc for riscv64 defines `BIGGEST_ALIGNMENT`, but it's mesured in bits.
++pub(crate) const __BIGGEST_ALIGNMENT_IN_BITS__: usize = 128;
++// `_ALIGNBYTES` is measured in, well, bytes.
++pub(crate) const _ALIGNBYTES: usize = (__BIGGEST_ALIGNMENT_IN_BITS__ / 8) - 1;
pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
+ pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
diff -u pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs:1.1 pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs:1.2
--- pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs:1.1 Sat Oct 18 17:14:36 2025
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs Thu Apr 2 19:06:35 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs,v 1.1 2025/10/18 17:14:36 he Exp $
+$NetBSD: patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs,v 1.2 2026/04/02 19:06:35 wiz Exp $
-Make this build on NetBSD for arm64 and mipsel as well.
+Make this build on NetBSD for arm6, mipsel and m68k as well.
---- vendor/openssl-src-300.5.0+3.5.0/src/lib.rs.orig 2025-05-18 21:45:55.955282328 +0000
+--- vendor/openssl-src-300.5.0+3.5.0/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
+++ vendor/openssl-src-300.5.0+3.5.0/src/lib.rs
@@ -321,6 +321,7 @@ impl Build {
"armv5te-unknown-linux-gnueabi" => "linux-armv4",
@@ -12,7 +12,15 @@ Make this build on NetBSD for arm64 and
"armv6-alpine-linux-musleabihf" => "linux-armv6",
"armv7-unknown-freebsd" => "BSD-armv4",
"armv7-unknown-linux-gnueabi" => "linux-armv4",
-@@ -356,6 +357,7 @@ impl Build {
+@@ -348,6 +349,7 @@ impl Build {
+ "i686-uwp-windows-msvc" => "VC-WIN32-UWP",
+ "loongarch64-unknown-linux-gnu" => "linux-generic64",
+ "loongarch64-unknown-linux-musl" => "linux-generic64",
++ "m68k-unknown-netbsd" => "NetBSD-generic32",
+ "mips-unknown-linux-gnu" => "linux-mips32",
+ "mips-unknown-linux-musl" => "linux-mips32",
+ "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
+@@ -356,6 +358,7 @@ impl Build {
"mips64el-unknown-linux-muslabi64" => "linux64-mips64",
"mipsel-unknown-linux-gnu" => "linux-mips32",
"mipsel-unknown-linux-musl" => "linux-mips32",
Added files:
Index: pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,38 @@
+$NetBSD: patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Add a target description for NetBSD/m68k.
+
+--- /dev/null 2026-02-24 21:43:45.067063051 +0000
++++ compiler/rustc_target/src/spec/targets/m68k_unknown_netbsd.rs 2026-02-24 21:48:57.106967890 +0000
+@@ -0,0 +1,31 @@
++use rustc_abi::Endian;
++
++use crate::spec::{Arch, LinkSelfContainedDefault, Target, TargetMetadata, TargetOptions, base};
++
++pub(crate) fn target() -> Target {
++ let mut base = base::netbsd::opts();
++ base.cpu = "M68020".into();
++ base.max_atomic_width = Some(32);
++
++ Target {
++ llvm_target: "m68k-unknown-netbsd".into(),
++ metadata: TargetMetadata {
++ description: Some("Motorola 680x0 NetBSD".into()),
++ tier: Some(3),
++ host_tools: Some(false),
++ std: Some(true),
++ },
++ pointer_width: 32,
++ data_layout: "E-m:e-p:32:16:32-i8:8:8-i16:16:16-i32:16:32-n8:16:32-a:0:16-S16".into(),
++ arch: Arch::M68k,
++ options: TargetOptions {
++ endian: Endian::Big,
++ mcount: "_mcount".into(),
++
++ // LLD currently does not have support for M68k
++ link_self_contained: LinkSelfContainedDefault::False,
++ ..base
++ },
++ }
++}
++
Index: pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_sanity.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_sanity.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_src_core_sanity.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bootstrap_src_core_sanity.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Temporarily add m68k-unknown-netbsd to STAGE0_MISSING_TARGETS.
+...while we bootstrap the target.
+
+--- src/bootstrap/src/core/sanity.rs.orig 2026-03-02 23:18:25.000000000 +0000
++++ src/bootstrap/src/core/sanity.rs
+@@ -38,6 +38,7 @@ pub struct Finder {
+ const STAGE0_MISSING_TARGETS: &[&str] = &[
+ // just a dummy comment so the list doesn't get onelined
+ "riscv64im-unknown-none-elf",
++ "m68k-unknown-netbsd",
+ ];
+
+ /// Minimum version threshold for libstdc++ required when using prebuilt LLVM
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
+isn't universally this type on the various NetBSD targets.
+
+--- vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-12-28 21:19:19.046785602 +0000
++++ vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -15,7 +15,7 @@ pub type lwpid_t = c_uint;
+ pub type shmatt_t = c_uint;
+ pub type cpuid_t = c_ulong;
+ pub type cpuset_t = _cpuset;
+-pub type pthread_spin_t = c_uchar;
++pub type pthread_spin_t = __pthread_spin_t;
+ pub type timer_t = c_int;
+
+ // elf.h
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Add cpu-specific file for m68k on NetBSD.
+
+--- /dev/null 2026-02-25 04:15:52.295235767 +0000
++++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/m68k.rs 2026-02-25 10:17:54.356620620 +0000
+@@ -0,0 +1,10 @@
++use crate::prelude::*;
++use crate::PT_FIRSTMACH;
++
++pub type __cpu_simple_lock_nv_t = u8;
++
++pub(crate) const _ALIGNBYTES: usize = size_of::<c_int>() - 1;
++
++pub const PT_STEP: c_int = PT_FIRSTMACH + 0;
++pub const PT_GETREGS: c_int = PT_FIRSTMACH + 1;
++pub const PT_SETREGS: c_int = PT_FIRSTMACH + 2;
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
+isn't universally this type on the various NetBSD targets.
+
+Also add m68k target.
+
+--- vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2026-02-11 07:30:54.000000000 +0000
++++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -15,7 +15,7 @@ pub type lwpid_t = c_uint;
+ pub type shmatt_t = c_uint;
+ pub type cpuid_t = c_ulong;
+ pub type cpuset_t = _cpuset;
+-pub type pthread_spin_t = c_uchar;
++pub type pthread_spin_t = __pthread_spin_t;
+ pub type timer_t = c_int;
+
+ // elf.h
+@@ -3001,6 +3001,9 @@ cfg_if! {
+ } else if #[cfg(target_arch = "riscv64")] {
+ mod riscv64;
+ pub use self::riscv64::*;
++ } else if #[cfg(target_arch = "m68k")] {
++ mod m68k;
++ pub use self::m68k::*;
+ } else {
+ // Unknown target_arch
+ }
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,71 @@
+$NetBSD: patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Unbreak this module.
+
+I admit to this entirely being based on "cargo cult" and based on
+what the compiler told me, but at least the rust compiler (cross-)builds
+for NetBSD/risc64 with this, whereas it did not earlier.
+
+--- vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-11-02 16:57:14.244169978 +0000
++++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,28 +1,48 @@
+-use PT_FIRSTMACH;
+-
+ use crate::prelude::*;
++use crate::PT_FIRSTMACH;
+
+ pub type __greg_t = u64;
+-pub type __cpu_simple_lock_nv_t = c_int;
+-pub type __gregset = [__greg_t; _NGREG];
+-pub type __fregset = [__freg; _NFREG];
++pub type __cpu_simple_lock_nv_t = c_uint;
++pub type __gregset_t = [__greg_t; _NGREG];
++pub type __fregset_t = [__fpreg; _NFREG];
++
++s_no_extra_traits! {
++ pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++ }
++}
+
+ s! {
+ pub struct mcontext_t {
+- pub __gregs: __gregset,
+- pub __fregs: __fpregset,
++ pub __gregs: __gregset_t,
++ pub __fregs: __fregset_t,
+ __spare: [crate::__greg_t; 7],
+ }
+ }
+
+-s_no_extra_traits! {
+- pub union __fpreg {
+- pub u_u64: u64,
+- pub u_d: c_double,
++cfg_if! {
++ if #[cfg(feature = "extra_traits")] {
++ impl PartialEq for __fpreg {
++ fn eq(&self, other: &__fpreg) -> bool {
++ unsafe { self.u_u64 == other.u_u64 || self.u_d == other.u_d }
++ }
++ }
++ impl Eq for __fpreg {}
++ impl hash::Hash for __fpreg {
++ fn hash<H: hash::Hasher>(&self, state: &mut H) {
++ unsafe {
++ self.u_u64.hash(state);
++ }
++ }
++ }
+ }
+ }
+
+-pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
++// gcc for riscv64 defines `BIGGEST_ALIGNMENT`, but it's mesured in bits.
++pub(crate) const __BIGGEST_ALIGNMENT_IN_BITS__: usize = 128;
++// `_ALIGNBYTES` is measured in, well, bytes.
++pub(crate) const _ALIGNBYTES: usize = (__BIGGEST_ALIGNMENT_IN_BITS__ / 8) - 1;
+
+ pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
+ pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs Thu Apr 2 19:06:34 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_m68k.rs,v 1.1 2026/04/02 19:06:34 wiz Exp $
+
+Add cpu-specific file for m68k on NetBSD.
+
+--- /dev/null 2026-02-25 04:15:52.295235767 +0000
++++ vendor/libc-0.2.178/src/unix/bsd/netbsdlike/netbsd/m68k.rs 2026-02-25 10:17:54.356620620 +0000
+@@ -0,0 +1,10 @@
++use crate::prelude::*;
++use crate::PT_FIRSTMACH;
++
++pub type __cpu_simple_lock_nv_t = u8;
++
++pub(crate) const _ALIGNBYTES: usize = size_of::<c_int>() - 1;
++
++pub const PT_STEP: c_int = PT_FIRSTMACH + 0;
++pub const PT_GETREGS: c_int = PT_FIRSTMACH + 1;
++pub const PT_SETREGS: c_int = PT_FIRSTMACH + 2;
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs Thu Apr 2 19:06:35 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Add m68k target.
+
+--- vendor/libc-0.2.178/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2026-03-02 23:18:25.000000000 +0000
++++ vendor/libc-0.2.178/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2437,6 +2437,9 @@ cfg_if! {
+ } else if #[cfg(target_arch = "riscv64")] {
+ mod riscv64;
+ pub use self::riscv64::*;
++ } else if #[cfg(target_arch = "m68k")] {
++ mod m68k;
++ pub use self::m68k::*;
+ } else {
+ // Unknown target_arch
+ }
Index: pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs Thu Apr 2 19:06:35 2026
@@ -0,0 +1,62 @@
+$NetBSD: patch-vendor_libc-0.2.178_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Unbreak this module.
+These changes have been submitted upstream, but apparently not
+in time for this rust release. Next time, perhaps...
+
+--- vendor/libc-0.2.178/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2026-03-06 20:53:35.722752261 +0000
++++ vendor/libc-0.2.178/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -2,17 +2,9 @@ use crate::prelude::*;
+ use crate::PT_FIRSTMACH;
+
+ pub type __greg_t = u64;
+-pub type __cpu_simple_lock_nv_t = c_int;
+-pub type __gregset = [__greg_t; _NGREG];
+-pub type __fregset = [__fpreg; _NFREG];
+-
+-s! {
+- pub struct mcontext_t {
+- pub __gregs: __gregset,
+- pub __fregs: __fregset,
+- __spare: [crate::__greg_t; 7],
+- }
+-}
++pub type __cpu_simple_lock_nv_t = c_uint;
++pub type __gregset_t = [__greg_t; _NGREG];
++pub type __fregset_t = [__fpreg; _NFREG];
+
+ s_no_extra_traits! {
+ pub union __fpreg {
+@@ -21,11 +13,19 @@ s_no_extra_traits! {
+ }
+ }
+
++s! {
++ pub struct mcontext_t {
++ pub __gregs: __gregset_t,
++ pub __fregs: __fregset_t,
++ __spare: [crate::__greg_t; 7],
++ }
++}
++
+ cfg_if! {
+ if #[cfg(feature = "extra_traits")] {
+ impl PartialEq for __fpreg {
+ fn eq(&self, other: &Self) -> bool {
+- unsafe { self.u_u64 == other.u_u64 }
++ unsafe { self.u_u64 == other.u_u64 || self.u_d == other.u_d }
+ }
+ }
+ impl Eq for __fpreg {}
+@@ -37,7 +37,10 @@ cfg_if! {
+ }
+ }
+
+-pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
++// gcc for riscv64 defines `BIGGEST_ALIGNMENT`, but it's mesured in bits.
++pub(crate) const __BIGGEST_ALIGNMENT_IN_BITS__: usize = 128;
++// `_ALIGNBYTES` is measured in, well, bytes.
++pub(crate) const _ALIGNBYTES: usize = (__BIGGEST_ALIGNMENT_IN_BITS__ / 8) - 1;
+
+ pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
+ pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf Thu Apr 2 19:06:35 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Replicate part of
+https://github.com/openssl/openssl/pull/15086
+
+--- vendor/openssl-src-300.5.4+3.5.4/openssl/Configurations/10-main.conf.orig 2025-11-02 17:12:27.865420544 +0000
++++ vendor/openssl-src-300.5.4+3.5.4/openssl/Configurations/10-main.conf
+@@ -1033,6 +1033,10 @@ my %targets = (
+ shared_target => "bsd-gcc-shared",
+ shared_cflag => "-fPIC",
+ },
++ "NetBSD-generic32" => {
++ inherit_from => [ "BSD-generic32" ],
++ ex_libs => add(threads("-latomic")),
++ },
+ "BSD-generic64" => {
+ inherit_from => [ "BSD-generic32" ],
+ bn_ops => "SIXTY_FOUR_BIT_LONG",
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c Thu Apr 2 19:06:35 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Make this build also if bswap32 is already defined, as for NetBSD/i586.
+
+--- vendor/openssl-src-300.5.4+3.5.4/openssl/crypto/aria/aria.c.orig 2025-11-02 17:14:42.569500518 +0000
++++ vendor/openssl-src-300.5.4+3.5.4/openssl/crypto/aria/aria.c
+@@ -32,9 +32,11 @@
+ #define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
+ #define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
+
++#ifndef bswap32
+ #define bswap32(v) \
+ (((v) << 24) ^ ((v) >> 24) ^ \
+ (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
++#endif
+
+ #define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
+ #define GET_U32_BE(X, Y) ( \
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs Thu Apr 2 19:06:35 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Make this build on NetBSD for armv6, mipsel and m68k as well.
+
+--- vendor/openssl-src-300.5.4+3.5.4/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
++++ vendor/openssl-src-300.5.4+3.5.4/src/lib.rs
+@@ -326,6 +326,7 @@ impl Build {
+ "armv5te-unknown-linux-gnueabi" => "linux-armv4",
+ "armv5te-unknown-linux-musleabi" => "linux-armv4",
+ "armv6-unknown-freebsd" => "BSD-generic32",
++ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
+ "armv6-alpine-linux-musleabihf" => "linux-armv6",
+ "armv7-unknown-freebsd" => "BSD-armv4",
+ "armv7-unknown-linux-gnueabi" => "linux-armv4",
+@@ -353,6 +354,7 @@ impl Build {
+ "i686-uwp-windows-msvc" => "VC-WIN32-UWP",
+ "loongarch64-unknown-linux-gnu" => "linux-generic64",
+ "loongarch64-unknown-linux-musl" => "linux-generic64",
++ "m68k-unknown-netbsd" => "NetBSD-generic32",
+ "mips-unknown-linux-gnu" => "linux-mips32",
+ "mips-unknown-linux-musl" => "linux-mips32",
+ "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
+@@ -361,6 +363,7 @@ impl Build {
+ "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
+ "mipsel-unknown-linux-gnu" => "linux-mips32",
+ "mipsel-unknown-linux-musl" => "linux-mips32",
++ "mipsel-unknown-netbsd" => "NetBSD-generic32",
+ "powerpc-unknown-freebsd" => "BSD-ppc",
+ "powerpc-unknown-linux-gnu" => "linux-ppc",
+ "powerpc-unknown-linux-gnuspe" => "linux-ppc",
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs Thu Apr 2 19:06:35 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-vendor_openssl-sys-0.9.111_build_find__normal.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Add hack for Darwin when homebrew is installed.
+
+--- vendor/openssl-sys-0.9.111/build/find_normal.rs.orig 2026-01-25 08:56:08.257782732 +0000
++++ vendor/openssl-sys-0.9.111/build/find_normal.rs
+@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
+ fn find_openssl_dir(target: &str) -> OsString {
+ let host = env::var("HOST").unwrap();
+
+- if host == target && target.ends_with("-apple-darwin") {
+- let homebrew_dir = match target {
+- "aarch64-apple-darwin" => "/opt/homebrew",
+- _ => "/usr/local",
+- };
+-
+- if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
+- return dir.into();
+- } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
+- // pkgsrc
+- return dir.into();
+- } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
+- // MacPorts
+- return dir.into();
+- }
+- }
+-
+ try_pkg_config();
+ try_vcpkg();
+
Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs:1.1
--- /dev/null Thu Apr 2 19:06:35 2026
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs Thu Apr 2 19:06:35 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-vendor_openssl-sys-0.9.111_build_main.rs,v 1.1 2026/04/02 19:06:35 wiz Exp $
+
+Patterned after Linux and Android, on 32-bit NetBSD ports
+include -latomic. Parts of this inspired by
+https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab13762a45
+
+--- vendor/openssl-sys-0.9.111/build/main.rs.orig 2026-01-25 08:57:28.677889187 +0000
++++ vendor/openssl-sys-0.9.111/build/main.rs
+@@ -279,6 +279,14 @@ fn main() {
+ println!("cargo:rustc-link-lib=atomic");
+ }
+
++ // Patterned of the above, make sure we include -latomic
++ // on ilp32 ports (yes, this only tests the "p32" part).
++ if env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
++ && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
++ {
++ println!("cargo:rustc-link-lib=atomic");
++ }
++
+ if kind == "static" && target.contains("windows") {
+ println!("cargo:rustc-link-lib=dylib=gdi32");
+ println!("cargo:rustc-link-lib=dylib=user32");
Home |
Main Index |
Thread Index |
Old Index