pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust193: Add a package for rust 1.93.0.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sat Jan 24 22:41:02 2026 +0000
Changeset: 722f94fb2919c64e7c1c9d775312e08c6611b060
Added Files:
rust193/DESCR
rust193/HOWTO-BOOTSTRAP
rust193/Makefile
rust193/buildlink3.mk
rust193/cargo.mk
rust193/cross.mk
rust193/distinfo
rust193/do-cross.mk
rust193/files/gcc-wrap
rust193/options.mk
rust193/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
rust193/patches/patch-compiler_rustc__llvm_build.rs
rust193/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
rust193/patches/patch-compiler_rustc__target_src_spec_mod.rs
rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
rust193/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
rust193/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
rust193/patches/patch-library_backtrace_src_symbolize_gimli.rs
rust193/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
rust193/patches/patch-library_std_src_sys_fs_unix.rs
rust193/patches/patch-src_bootstrap_bootstrap.py
rust193/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
rust193/patches/patch-src_bootstrap_src_core_build__steps_install.rs
rust193/patches/patch-src_bootstrap_src_core_builder_cargo.rs
rust193/patches/patch-src_bootstrap_src_lib.rs
rust193/patches/patch-src_llvm-project_llvm_CMakeLists.txt
rust193/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
rust193/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
rust193/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
rust193/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
rust193/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
rust193/patches/patch-src_tools_cargo_tests_testsuite_build.rs
rust193/patches/patch-src_tools_rust-installer_install-template.sh
rust193/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
rust193/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
rust193/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust193/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
rust193/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
rust193/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust193/patches/patch-vendor_line-index-0.1.2_src_lib.rs
rust193/patches/patch-vendor_lzma-sys-0.1.20_config.h
rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
rust193/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
rust193/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
rust193/patches/patch-vendor_memchr-2.7.4_src_vector.rs
rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
rust193/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
rust193/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
rust193/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
rust193/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
rust193/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
rust193/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
rust193/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
rust193/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
rust193/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
rust193/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
rust193/platform.mk
rust193/rust.mk
Log Message:
rust193: Add a package for rust 1.93.0.
Pkgsrc changes:
* Update version & checksums.
* Adapt openssl-src patches to minor version update.
Noteable failures at the time of commit:
* The cross-build for sparc64 fails, not yet reported.
Upstream changes relative to 1.92.0:
Version 1.93 (2026-01-22)
==========================
Language
--------
- [Add warn-by-default `function_casts_as_integer` lint]
(https://github.com/rust-lang/rust/pull/141470)
- [Add future-incompatibility warning for `...` function parameters
without a pattern outside of `extern` blocks]
(https://github.com/rust-lang/rust/pull/143619)
- [Stabilize several s390x `vector`-related target features and
the `is_s390x_feature_detected!` macro]
(https://github.com/rust-lang/rust/pull/145656)
- [Stabilize declaration of C-style variadic functions for the `system` ABI]
(https://github.com/rust-lang/rust/pull/145954)
- [Emit error when using some keyword as a `cfg` predicate]
(https://github.com/rust-lang/rust/pull/146978)
- [Introduce future-compatibility warning for `repr(C)` enums whose
discriminant values do not fit into a `c_int` or `c_uint`]
(https://github.com/rust-lang/rust/pull/147017)
- [Introduce future-compatibility warning against ignoring `repr(C)`
types as part of `repr(transparent)`]
(https://github.com/rust-lang/rust/pull/147185)
- [Stabilize `asm_cfg`]
(https://github.com/rust-lang/rust/pull/147736)
- [Upgrade the `deref_nullptr` lint from warn-by-default to deny-by-default]
(https://github.com/rust-lang/rust/pull/148122)
- [During const-evaluation, support copying pointers byte-by-byte]
(https://github.com/rust-lang/rust/pull/148259)
- [Add warn-by-default `const_item_interior_mutations` lint to warn
against calls which mutate interior mutable `const` items]
(https://github.com/rust-lang/rust/pull/148407)
- [LUB coercions now correctly handle function item types, and
functions with differing safeties]
(https://github.com/rust-lang/rust/pull/148602)
- [Allow `const` items that contain mutable references to `static`
(which is *very* unsafe, but not *always* UB)]
(https://github.com/rust-lang/rust/pull/148746)
Compiler
--------
- [Stabilize `-Cjump-tables=bool`]
(https://github.com/rust-lang/rust/pull/145974). The flag was
previously called `-Zno-jump-tables`.
- [Promote `riscv64a23-unknown-linux-gnu` to Tier 2 (without host tools)]
(https://github.com/rust-lang/rust/pull/148435)
Platform Support
----------------
Refer to Rust's [platform support page][platform-support-doc]
for more information on Rust's tiered platform support.
[platform-support-doc]: https://doc.rust-lang.org/rustc/platform-support.html
Libraries
---------
- [Stop internally using `specialization` on the `Copy` trait as
it is unsound in the presence of lifetime dependent `Copy`
implementations. This may result in some performance regressions
as some standard library APIs may now call `Clone::clone` instead
of performing bitwise copies]
(https://github.com/rust-lang/rust/pull/135634)
- [Allow the global allocator to use thread-local storage and
`std::thread::current()`]
(https://github.com/rust-lang/rust/pull/144465)
- [Make `BTree::append` not update existing keys when appending an
entry which already exists]
(https://github.com/rust-lang/rust/pull/145628)
- [Don't require `T: RefUnwindSafe` for `vec::IntoIter<T>: UnwindSafe`]
(https://github.com/rust-lang/rust/pull/145665)
Stabilized APIs
---------------
- [`<MaybeUninit<T>>::assume_init_drop`]
(https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.assume_init_drop)
- [`<MaybeUninit<T>>::assume_init_ref`]
(https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.assume_init_ref)
- [`<MaybeUninit<T>>::assume_init_mut`]
(https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.assume_init_mut)
- [`<[MaybeUninit<T>]>::write_copy_of_slice`]
(https://doc.rust-lang.org/stable/std/primitive.slice.html#method.write_copy_of_slice)
- [`<[MaybeUninit<T>]>::write_clone_of_slice`]
(https://doc.rust-lang.org/stable/std/primitive.slice.html#method.write_clone_of_slice)
- [`String::into_raw_parts`]
(https://doc.rust-lang.org/stable/std/string/struct.String.html#method.into_raw_parts)
- [`Vec::into_raw_parts`]
(https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#method.into_raw_parts)
- [`<iN>::unchecked_neg`]
(https://doc.rust-lang.org/stable/std/primitive.isize.html#method.unchecked_neg)
- [`<iN>::unchecked_shl`]
(https://doc.rust-lang.org/stable/std/primitive.isize.html#method.unchecked_shl)
- [`<iN>::unchecked_shr`]
(https://doc.rust-lang.org/stable/std/primitive.isize.html#method.unchecked_shr)
- [`<uN>::unchecked_shl`]
(https://doc.rust-lang.org/stable/std/primitive.usize.html#method.unchecked_shl)
- [`<uN>::unchecked_shr`]
(https://doc.rust-lang.org/stable/std/primitive.usize.html#method.unchecked_shr)
- [`<[T]>::as_array`]
(https://doc.rust-lang.org/stable/std/primitive.slice.html#method.as_array)
- [`<[T]>::as_array_mut`]
(https://doc.rust-lang.org/stable/std/primitive.slice.html#method.as_mut_array)
- [`<*const [T]>::as_array`]
(https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.as_array)
- [`<*mut [T]>::as_array_mut`]
(https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.as_mut_array)
- [`VecDeque::pop_front_if`]
(https://doc.rust-lang.org/stable/std/collections/struct.VecDeque.html#method.pop_front_if)
- [`VecDeque::pop_back_if`]
(https://doc.rust-lang.org/stable/std/collections/struct.VecDeque.html#method.pop_back_if)
- [`Duration::from_nanos_u128`]
(https://doc.rust-lang.org/stable/std/time/struct.Duration.html#method.from_nanos_u128)
- [`char::MAX_LEN_UTF8`]
(https://doc.rust-lang.org/stable/std/primitive.char.html#associatedconstant.MAX_LEN_UTF8)
- [`char::MAX_LEN_UTF16`]
(https://doc.rust-lang.org/stable/std/primitive.char.html#associatedconstant.MAX_LEN_UTF16)
- [`std::fmt::from_fn`]
(https://doc.rust-lang.org/stable/std/fmt/fn.from_fn.html)
- [`std::fmt::FromFn`]
(https://doc.rust-lang.org/stable/std/fmt/struct.FromFn.html)
Cargo
-----
- [Enable CARGO_CFG_DEBUG_ASSERTIONS in build scripts based on profile]
(https://github.com/rust-lang/cargo/pull/16160/)
- [In `cargo tree`, support long forms for `--format` variables]
(https://github.com/rust-lang/cargo/pull/16204/)
- [Add `--workspace` to `cargo clean`]
(https://github.com/rust-lang/cargo/pull/16263/)
Rustdoc
-----
- [Remove `#![doc(document_private_items)]`](https://github.com/rust-lang/rust/pull/146495)
- [Include attribute and derive macros in search filters for "macros"](https://github.com/rust-lang/rust/pull/148176)
- [Include extern crates in search filters for `import`](https://github.com/rust-lang/rust/pull/148301)
- [Validate usage of crate-level doc attributes](https://github.com/rust-lang/rust/pull/149197). This means if any of `html_favicon_url`, `html_logo_url`, `html_playground_url`, `issue_tracker_base_url`, or `html_no_source` either has a missing value, an unexpected value, or a value of the wrong type, rustdoc will emit the deny-by-default lint `rustdoc::invalid_doc_attributes`.
Compatibility Notes
-------------------
- [Introduce `pin_v2` into the builtin attributes namespace]
(https://github.com/rust-lang/rust/pull/139751)
- [Update bundled musl to 1.2.5]
(https://github.com/rust-lang/rust/pull/142682)
- [On Emscripten, the unwinding ABI used when compiling with
`panic=unwind` was changed from the JS exception handling ABI to
the wasm exception handling ABI.]
(https://github.com/rust-lang/rust/pull/147224) If linking C/C++
object files with Rust objects, `-fwasm-exceptions` must be passed
to the linker now. On nightly Rust, it is possible to get the
old behavior with `-Zwasm-emscripten-eh=false -Zbuild-std`, but
it will be removed in a future release.
- The `#[test]` attribute, used to define tests, was previously
ignored in various places where it had no meaning (e.g on trait
methods or types). Putting the `#[test]` attribute in these places
is no longer ignored, and will now result in an error; this may
also result in errors when generating rustdoc. [Error when `test`
attribute is applied to structs]
(https://github.com/rust-lang/rust/pull/147841)
- Cargo now sets the `CARGO_CFG_DEBUG_ASSERTIONS` environment
variable in more situations. This will cause crates depending on
`static-init` versions 1.0.1 to 1.0.3 to fail compilation with
"failed to resolve: use of unresolved module or unlinked crate
`parking_lot`". See [the linked issue]
(https://github.com/rust-lang/rust/issues/150646#issuecomment-3718964342)
for details.
- [User written types in the `offset_of!` macro are now checked to
be well formed.]
(https://github.com/rust-lang/rust/issues/150465/)
- `cargo publish` no longer emits `.crate` files as a final artifact
for user access when the `build.build-dir` config is unset
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=722f94fb2919c64e7c1c9d775312e08c6611b060
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust193/DESCR | 13 +
rust193/HOWTO-BOOTSTRAP | 85 +++
rust193/Makefile | 800 +++++++++++++++++++++
rust193/buildlink3.mk | 28 +
rust193/cargo.mk | 121 ++++
rust193/cross.mk | 83 +++
rust193/distinfo | 172 +++++
rust193/do-cross.mk | 107 +++
rust193/files/gcc-wrap | 210 ++++++
rust193/options.mk | 116 +++
...compiler_rustc__codegen__ssa_src_back_linker.rs | 27 +
.../patches/patch-compiler_rustc__llvm_build.rs | 50 ++
...-compiler_rustc__target_src_spec_base_netbsd.rs | 32 +
.../patch-compiler_rustc__target_src_spec_mod.rs | 14 +
...rc_spec_targets_aarch64__be__unknown__netbsd.rs | 17 +
...et_src_spec_targets_aarch64__unknown__netbsd.rs | 17 +
...t_src_spec_targets_mips64el__unknown__netbsd.rs | 39 +
...get_src_spec_targets_mipsel__unknown__netbsd.rs | 14 +
.../patch-library_backtrace_src_symbolize_gimli.rs | 14 +
...ch-library_backtrace_src_symbolize_gimli_elf.rs | 26 +
.../patches/patch-library_std_src_sys_fs_unix.rs | 86 +++
rust193/patches/patch-src_bootstrap_bootstrap.py | 48 ++
...-src_bootstrap_src_core_build__steps_compile.rs | 15 +
...-src_bootstrap_src_core_build__steps_install.rs | 13 +
.../patch-src_bootstrap_src_core_builder_cargo.rs | 26 +
rust193/patches/patch-src_bootstrap_src_lib.rs | 40 ++
.../patch-src_llvm-project_llvm_CMakeLists.txt | 18 +
...c_llvm-project_llvm_cmake_modules_AddLLVM.cmake | 49 ++
...rc_llvm-project_llvm_include_llvm-c_DataTypes.h | 34 +
...ct_llvm_include_llvm_Analysis_ConstantFolding.h | 18 +
...llvm-project_llvm_utils_FileCheck_FileCheck.cpp | 15 +
...atch-src_tools_cargo_src_cargo_core_profiles.rs | 17 +
.../patch-src_tools_cargo_tests_testsuite_build.rs | 39 +
...ch-src_tools_rust-installer_install-template.sh | 72 ++
...atch-tests_assembly-llvm_targets_targets-elf.rs | 16 +
...tch-vendor_crossbeam-utils-0.8.18_no__atomic.rs | 14 +
...c-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 +
...ch-vendor_libc-0.2.155_src_unix_solarish_mod.rs | 15 +
...c-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 +
...2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 44 ++
...ch-vendor_libc-0.2.168_src_unix_solarish_mod.rs | 15 +
...c-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 +
...2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 90 +++
...ch-vendor_libc-0.2.169_src_unix_solarish_mod.rs | 15 +
...2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 90 +++
...2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 89 +++
...ch-vendor_libc-0.2.172_src_unix_solarish_mod.rs | 15 +
...2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 89 +++
...c-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs | 16 +
...2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 71 ++
...c-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs | 16 +
...2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 71 ++
.../patch-vendor_line-index-0.1.2_src_lib.rs | 42 ++
.../patches/patch-vendor_lzma-sys-0.1.20_config.h | 25 +
...-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs | 24 +
...tch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs | 15 +
.../patch-vendor_memchr-2.7.4_src_memchr.rs | 128 ++++
...atch-vendor_memchr-2.7.4_src_memmem_searcher.rs | 78 ++
.../patch-vendor_memchr-2.7.4_src_vector.rs | 15 +
...28.2+1.1.1w_openssl_Configurations_10-main.conf | 18 +
...-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c | 18 +
...h-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs | 64 ++
...0.5.0+3.5.0_openssl_Configurations_10-main.conf | 18 +
...sl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c | 18 +
...tch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs | 22 +
...0.5.4+3.5.4_openssl_Configurations_10-main.conf | 18 +
...sl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c | 18 +
...tch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs | 22 +
...endor_openssl-sys-0.9.107_build_find__normal.rs | 30 +
.../patch-vendor_openssl-sys-0.9.107_build_main.rs | 23 +
...endor_openssl-sys-0.9.109_build_find__normal.rs | 30 +
.../patch-vendor_openssl-sys-0.9.109_build_main.rs | 23 +
...vendor_openssl-sys-0.9.92_build_find__normal.rs | 30 +
.../patch-vendor_openssl-sys-0.9.92_build_main.rs | 23 +
...target_src_spec_aarch64__be__unknown__netbsd.rs | 27 +
.../patch-vendor_zerocopy-0.7.32_src_lib.rs | 25 +
.../patch-vendor_zerocopy-0.7.35_src_lib.rs | 25 +
.../patches/patch-vendor_zeroize-1.8.1_src_lib.rs | 15 +
rust193/platform.mk | 34 +
rust193/rust.mk | 60 ++
80 files changed, 4074 insertions(+)
diffs:
diff --git a/rust193/DESCR b/rust193/DESCR
new file mode 100644
index 0000000000..6dc90a671e
--- /dev/null
+++ b/rust193/DESCR
@@ -0,0 +1,13 @@
+Rust is a systems programming language focused on three goals: safety,
+speed, and concurrency. It maintains these goals without having a
+garbage collector, making it a useful language for a number of use cases
+other languages aren't good at: embedding in other languages, programs
+with specific space and time requirements, and writing low-level code,
+like device drivers and operating systems.
+
+It improves on current languages targeting this space by having a number
+of compile-time safety checks that produce no runtime overhead, while
+eliminating all data races. Rust also aims to achieve "zero-cost
+abstractions" even though some of these abstractions feel like those of
+a high-level language. Even then, Rust still allows precise control
+like a low-level language would.
diff --git a/rust193/HOWTO-BOOTSTRAP b/rust193/HOWTO-BOOTSTRAP
new file mode 100644
index 0000000000..81133db2ec
--- /dev/null
+++ b/rust193/HOWTO-BOOTSTRAP
@@ -0,0 +1,85 @@
+How to build a rust bootstrap kit using pkgsrc
+----------------------------------------------
+
+A rust bootstrap kit is simply a pre-compiled binary of rust and
+the rust standard library, and contains the "rust" and "rust-std"
+build results, found in
+
+ work/rustc-<version>/build/dist/
+as
+ rust-<version>-<target>.tar.xz
+and
+ rust-std-<version>-<target>.tar.xz
+
+These result files are produced when the "dist" build target is
+used, ref. BUILD_TARGET. For a normal native build of the rust
+pkgsrc package, the default BUILD_TARGET is "build", not "dist".
+
+There are two possible ways to produce a bootstrap kit:
+
+1) a native build. This requires minimum preparation, except
+ possibly for setting rust.BUILD_TARGET to "dist" via e.g.
+ /etc/mk.conf. Note that on NetBSD, using the "BUILD_TARGET" ==
+ "dist" results in the "rust-cargo-static" option being set, ref.
+ options.mk. This is so that the resulting bootstrap kits are
+ built with mostly-static linking, reducing the run-time dependencies
+ of the bootstrap kits.
+
+2) a cross-build. This requires a bit of preparation:
+
+ For each target you want to cross-build rust for, you need
+ - the cross toolchain resulting from "build.sh tools" for
+ the intended target
+ - an OS distribution extracted, including the comp.tgz
+ set so that the target's include files can be used
+ - for 32-bit ports, the "libatomic" package needs to be
+ available. I'm sure there's a clever and long-winded
+ use of pkg_install which can be used to effect this;
+ I on my hand have always just extracted the tgz file
+ and done the minimal cleanup of the "cruft" files
+ which are part of the package meta-data.
+ - Pick a root directory for the target, e.g. /u/i386.
+ Below this directory place the "tools" containing
+ the cross-compiler in a "tools" sub-directory.
+ Similarly, the extracted OS distribution in the "dest"
+ sub-directory.
+
+ There are two methods available for doing the cross-compile:
+
+ a) Using the "cross.mk" file. For an i386 build against i586, the
+ following settings should be active:
+
+CROSS_ROOT= /u/i386
+MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT}
+GNU_CROSS_TARGET= i486--netbsdelf
+MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
+TARGET= i586-unknown-netbsd
+SCRIPTS= ${WRKDIR}/scripts
+CONFIGURE_ARGS+= --host=${TARGET}
+CONFIGURE_ARGS+= --target=${TARGET}
+CONFIGURE_ARGS+= --set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
+CONFIGURE_ARGS+= --set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
+CONFIGURE_ARGS+= --set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
+CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
+
+ Then doing a "make" will cross-build rust, including the LLVM
+ embedded in the rust distribution, ref. the defaulting of that
+ option when TARGET is defined ref. options.mk.
+
+ Note that when TARGET is set, the default build target for
+ the rust makefile becomes "dist", so there's no need to set
+ rust.BUILD_TARGET for cross-builds.
+
+ b) Using the "do-cross.mk" Makefile. This will attempt to
+ cross-build rust for all the targets listed in the SHORT_TARGETS
+ variable in that file. Overriding the root directories for
+ the various targets can be done by making your own "local-roots.mk"
+ file, ref. "do-cross.mk".
+
+ This will create a "dist" subdirectory in the rust pkgsrc
+ directory, and the bootstrap kits for each architecture, plus
+ the library source kit will be placed in this directory.
+
+The bootstrap kits can then be placed in /usr/pkgsrc/distfiles, and
+be used by the "next" rust version, where you can use "make makesum"
+to compute the updated checksums for the bootstrap kits.
diff --git a/rust193/Makefile b/rust193/Makefile
new file mode 100644
index 0000000000..796166132d
--- /dev/null
+++ b/rust193/Makefile
@@ -0,0 +1,800 @@
+# $NetBSD: Makefile,v 1.339 2025/06/17 15:19:17 jperkin Exp $
+
+DISTNAME= rustc-1.93.0-src
+PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
+CATEGORIES= lang
+MASTER_SITES= https://static.rust-lang.org/dist/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.rust-lang.org/
+COMMENT= Safe, concurrent, practical language
+LICENSE= mit OR apache-2.0
+
+CONFLICTS+= rust-bin-[0-9]*
+
+# LLVM uses -std=c++17
+USE_CXX_FEATURES+= c++17
+USE_GCC_RUNTIME= yes
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= bash grep gmake perl:build pkg-config
+
+# This is a bug:
+# https://github.com/rust-lang/rust/issues/130708
+# "Building rust 1.81.0 does network access in the "build" phase"
+# but set it for now to allow progress in finding other build issues.
+#ALLOW_NETWORK_ACCESS= yes
+# Ref. dist.vendor below.
+
+# The NetBSD bootstraps are built for NetBSD 9 (because rust doesn't
+# build on 8 or earlier), or because the target didn't exist in 8
+# or 9 (as in riscv64). Therefore, mark earlier versions as broken.
+BROKEN_ON_PLATFORM+= NetBSD-[1-8].*-*
+
+HAS_CONFIGURE= yes
+PYTHON_FOR_BUILD_ONLY= tool
+CONFIG_SHELL= ${TOOL_PYTHONBIN}
+CONFIGURE_SCRIPT= src/bootstrap/configure.py
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --python=${TOOL_PYTHONBIN}
+CONFIGURE_ARGS+= --release-channel=stable
+CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH}
+CONFIGURE_ARGS+= --enable-extended # Build and install cargo too.
+CONFIGURE_ARGS+= --enable-rpath
+CONFIGURE_ARGS+= --disable-codegen-tests
+CONFIGURE_ARGS+= --disable-compiler-docs
+CONFIGURE_ARGS+= --disable-llvm-static-stdcpp
+CONFIGURE_ARGS+= --disable-ninja
+CONFIGURE_ARGS+= --dist-compression-formats=xz
+# Ref. issue #130708 & backport of pull-request 130110
+CONFIGURE_ARGS+= --set dist.vendor=false
+
+REPLACE_BASH+= library/portable-simd/subtree-sync.sh
+CB= library/compiler-builtins
+REPLACE_BASH+= ${CB}/ci/bench-icount.sh
+REPLACE_BASH+= ${CB}/ci/miri.sh
+REPLACE_BASH+= ${CB}/ci/run-docker.sh
+REPLACE_BASH+= ${CB}/ci/run-extensive.sh
+REPLACE_BASH+= ${CB}/ci/run.sh
+
+REPLACE_PYTHON+= ${CB}/ci/ci-util.py
+REPLACE_PYTHON+= ${CB}/etc/update-api-list.py
+
+# Include (optional) settings to cross-build rust
+.include "cross.mk"
+
+# optional from do-cross.mk
+CONFIGURE_ARGS+= ${ADD_CONFIGURE_ARGS}
+
+# This should allow us to perform "offline" builds (so cargo doesn't fetch
+# dependencies during the build stage) but this isn't hooked up yet.
+CONFIGURE_ARGS+= --enable-vendor
+
+# cargo defaults to using the number of available CPUs
+MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
+
+CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
+MAKE_ENV.SunOS+= AR=gar
+
+# Debugging of crate resolution
+# Annoyingly, this makes the powerpc build succeed...
+#MAKE_ENV+= RUSTC_LOG=rustc_metadata
+
+UNLIMIT_RESOURCES+= cputime stacksize datasize virtualsize
+
+TEST_TARGET= check
+
+# bin/* lib/*, but names vary
+CHECK_RELRO_SUPPORTED= no
+CHECK_SSP_SUPPORTED= no
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Getting RPATH with $ORIGIN into the bootstrap binaries is
+# problematic, since pkgsrc refuses to put $ORIGIN into RPATHs
+# of executables. So instead we need these so that the bootstrap
+# compiler can be run out of the $RUST_BOOTSTRAP_PATH directory as
+# part of the initial part of the rust compiler build.
+# This problem is not present with the amd64 bootstrap bits,
+# which are built by our upstream and uses $ORIGIN/../lib in RPATH.
+#
+# The above is only true on NetBSD, for other bootstrap kits (e.g. illumos)
+# the binaries are made to be relocatable after the build using elfedit or
+# similar. It is unclear why this approach is not used by NetBSD too.
+#
+MAKE_ENV+= LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+.endif
+
+# TODO: Hack introduced for 1.86.0 as @loader_path is stripped from the
+# bootstrap compiler arguments and the stage1 libraries cannot be found.
+# Ideally this should be inserted only in the necessary points of the
+# bootstrap script.
+.if ${OPSYS} == "Darwin"
+MAKE_ENV+= DYLD_LIBRARY_PATH="${WRKSRC}/build/${MACHINE_ARCH}-apple-darwin/stage1/lib:${WRKSRC}/build/${MACHINE_ARCH}-apple-darwin/stage2/lib"
+.endif
+
+# Allow overriding MAKE_JOBS_SAFE
+# some may chose to mostly build faster,
+# and deal with any failures due to deadlocks
+.if !empty(rust.MAKE_JOBS_SAFE)
+. if ${rust.MAKE_JOBS_SAFE:tl} == "yes"
+MAKE_JOBS_SAFE= yes
+. endif
+.endif
+
+.if !empty(rust.BUILD_TARGET)
+BUILD_TARGET= ${rust.BUILD_TARGET}
+.endif
+
+.if !empty(TARGET)
+# Use "dist" build target for cross compile of bootstrap
+BUILD_TARGET?= dist
+.else
+BUILD_TARGET?= build
+.endif
+
+.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
+ ${MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf} || \
+ ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || \
+ !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf) || \
+ !empty(TARGET:Mmipsel-unknown-netbsd)
+# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc
+# (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits)
+# Also try to downsize the armv[67] build.
+CONFIGURE_ARGS+= --disable-debug
+CONFIGURE_ARGS+= --disable-debug-assertions
+CONFIGURE_ARGS+= --disable-llvm-release-debuginfo
+CONFIGURE_ARGS+= --debuginfo-level=0
+CONFIGURE_ARGS+= --debuginfo-level-rustc=0
+CONFIGURE_ARGS+= --debuginfo-level-std=0
+CONFIGURE_ARGS+= --debuginfo-level-tools=0
+CONFIGURE_ARGS+= --debuginfo-level-tests=0
+.endif
+
+# Only build the ARM target on/for this host, due to resource constraints
+.if ${MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf}
+CONFIGURE_ARGS+= --set llvm.targets="ARM"
+.endif
+# When cross-building for ARM on X86, X86 needs to go along due
+# to 2-stage build process
+.if !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf)
+CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
+.endif
+# Same for mips:
+.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel}
+CONFIGURE_ARGS+= --set llvm.targets="Mips"
+.endif
+.if !empty(TARGET:Mmipsel-unknown-netbsd)
+CONFIGURE_ARGS+= --set llvm.targets="Mips;X86"
+.endif
+
+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
+CHECK_PORTABILITY_SKIP+= tests/run-make/dump-ice-to-disk/check.sh
+CHECK_PORTABILITY_SKIP+= vendor/libdbus-sys-0.2.5/vendor/dbus/tools/cmake-format
+
+.if ${OPSYS} == "NetBSD"
+# This block contains information about known trouble on NetBSD and workarounds.
+
+# Parallel builds failed on NetBSD due to dynamic linker locking bugs.
+# \todo Explain if the build is believed to be sound if not parallel,
+# or if a non-parallel build is merely more likely to work.
+#
+# See toolchain/54192 at
+# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54192
+# which was fixed in -current on 2020-04-19:
+# http://mail-index.netbsd.org/source-changes/2020/04/16/msg116256.html
+# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html
+# These were pulled up to netbsd-9 on 2020-05-13:
+# http://releng.netbsd.org/cgi-bin/req-9.cgi?show=907
+# This has not been pulled up to netbsd-8
+# \todo Explain if it's not applicable, shouldn't be pulled up, should be
+# but hasn't, is too hard, etc.
+#
+# On pkgbuild for 2020Q1 9.0_RELEASE amd64, rust did not build despite
+# MAKE_JOBS_SAFE=no, but setting MAKE_JOBS=1 resulted in success. (No
+# PR is open for this.) \todo Understand and fix.
+#
+# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
+# Release 9.x and 9.1 or later is OK.
+. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090999 && ${OPSYS_VERSION} < 090900
+MAKE_JOBS_SAFE?= no
+. endif
+
+# Open PRs
+#
+# Broken package with PREFIX not /usr/pkg:
+# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54453
+#
+
+.endif
+
+#
+# Under NetBSD, do not use DT_RUNPATH
+#
+BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
+
+#
+# Somewhere in the LLVM build "-arch x86_64" is passed on macOS/arm64 which
+# breaks linking, see https://github.com/rust-lang/rust/issues/81790. Until
+# this can be located (proving difficult!) we just force it.
+#
+.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
+BUILDLINK_TRANSFORM+= opt:x86_64:arm64
+.endif
+
+#
+# Rust unfortunately requires itself to build. On platforms which aren't
+# supported by upstream (where they offer binary bootstraps), or where we do
+# not trust random binaries from the Internet, we need to build and provide our
+# own bootstrap. See the stage0-bootstrap below for more details.
+#
+DISTFILES:= ${DEFAULT_DISTFILES}
+
+.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
+RUST_STAGE0_VER= 1.92.0
+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.92.0
+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.92.0
+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.92.0
+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.92.0
+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.92.0
+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.92.0
+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
+DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+.endif
+#
+# The SunOS target defaults to illumos as that's what the current bootstraps
+# are built on. If you wish to target Oracle Solaris you'll need to create an
+# 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.91.0
+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/
+DISTFILES:= ${DISTFILES} ${RUST_STAGE0}
+RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
+# Override default "x86_64-sun-solaris" selection
+CONFIGURE_ARGS+= --set=target.${RUST_ARCH}.llvm-config=${LLVM_CONFIG_PATH}
+CONFIGURE_ARGS+= --build=${RUST_ARCH}
+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.92.0
+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.92.0
+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
+SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
+SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
+DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+# Setting this changes it for every distfile, which doesn't match what is
+# currently in distinfo.
+#DIST_SUBDIR= ${PKGNAME}
+# For atomic ops
+CFLAGS+= -march=i586
+CONFIGURE_ARGS+= --build=${RUST_ARCH}
+pre-build: pre-build-fix-paxctl
+.PHONY: pre-build-fix-paxctl
+pre-build-fix-paxctl:
+ ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
+ ${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.92.0
+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.92.0
+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
+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-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
+RUST_STAGE0_VER= 1.92.0
+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
+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.92.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-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
+RUST_STAGE0_VER= 1.92.0
+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
+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-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
+RUST_ARCH= armv7-unknown-netbsd-eabihf
+RUST_STAGE0_VER= 1.92.0
+RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
+SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
+.endif
+.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
+RUST_ARCH= armv6-unknown-netbsd-eabihf
+RUST_STAGE0_VER= 1.92.0
+RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
+SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
+.endif
+#.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
+#RUST_ARCH= mipsel-unknown-netbsd
+#RUST_STAGE0_VER= 1.92.0
+#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-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
+RUST_ARCH= riscv64gc-unknown-netbsd
+RUST_STAGE0_VER= 1.92.0
+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
+
+# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf
+# if you have a local bootstrap compiler.
+.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH)
+NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM}
+.else
+RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap
+.endif
+
+.if ${OPSYS} == "SunOS"
+TOOL_DEPENDS+= coreutils>=0:../../sysutils/coreutils
+TOOL_DEPENDS+= gzip>=0:../../archivers/gzip
+TOOLS_CREATE+= md5sum
+TOOLS_PATH.md5sum= ${TOOLBASE}/bin/gmd5sum
+TOOLS_PLATFORM.gzcat= ${TOOLBASE}/bin/gzip -cd
+.endif
+
+SUBST_CLASSES+= prefix
+SUBST_STAGE.prefix= pre-configure
+SUBST_FILES.prefix+= compiler/rustc_codegen_ssa/src/back/linker.rs
+SUBST_FILES.prefix+= compiler/rustc_target/src/spec/base/netbsd.rs
+SUBST_FILES.prefix+= src/bootstrap/src/core/build_steps/compile.rs
+SUBST_FILES.prefix+= src/bootstrap/src/core/builder/cargo.rs
+SUBST_FILES.prefix+= src/bootstrap/bootstrap.py
+SUBST_VARS.prefix= PREFIX
+
+#
+# Generate list of subst entries for various .cargo-checksum.json files. These
+# are all handled together in one big substitution to simplify things rather
+# than one substitution entry per file, but are kept separate below to ease
+# updating and verification.
+#
+
+CKSUM_CRATES+= vendor/crossbeam-utils-0.8.18
+CKSUMS+= 31a8276afd38e39987a169eeb02e9bed32670de5ca36d7eb74aab7e506cf9dc4
+CKSUMS+= ead4bda23c322bde8c01e48d4cd19b70e7b7e473a56466218d279f88463ab466
+
+CKSUM_CRATES+= vendor/openssl-src-300.5.0+3.5.0
+CKSUMS+= 16c0b9fa70475cfb50ac21ad4ce049b494c45b3270fed386013785a28abb8d0a
+CKSUMS+= 6e30595035395b92291de1b59b6e7b3e19732f15a6012bfe0c239b62c8738225
+CKSUMS+= 6e62515e67910aea2f04b64c643aa2545732f9dd7bf0abf87d8accf8c2c1fb88
+CKSUMS+= ccc5252660386fbfec2d66423f2dc87e6da74efd39ca0fcd7c7fd583056725c1
+CKSUMS+= ac5501e7bff0f4384db0537307b362bf1bcb120d8b5859e5f08bd796e78feaea
+CKSUMS+= 6d2c2831119e059d35e81a89b08195a29e325f68acfd86a3a7157ebf8e78182d
+
+CKSUM_CRATES+= vendor/openssl-src-300.5.4+3.5.4
+CKSUMS+= 33f1e78110293a8558ae997ed57e7aac72c5bfd47a241dc7f6e2ffa98b7a7137
+CKSUMS+= c2f9725d735ef641df5273f20102413fd42ef1aec44428689803af4d8d706b79
+# covered by 3.5.0:
+#CKSUMS+= 6e62515e67910aea2f04b64c643aa2545732f9dd7bf0abf87d8accf8c2c1fb88
+#CKSUMS+= ccc5252660386fbfec2d66423f2dc87e6da74efd39ca0fcd7c7fd583056725c1
+#CKSUMS+= ac5501e7bff0f4384db0537307b362bf1bcb120d8b5859e5f08bd796e78feaea
+#CKSUMS+= 6d2c2831119e059d35e81a89b08195a29e325f68acfd86a3a7157ebf8e78182d
+
+#CKSUM_CRATES+= vendor/openssl-sys-0.9.92
+#CKSUMS+=
+#CKSUMS+=
+
+CKSUM_CRATES+= vendor/openssl-sys-0.9.107
+CKSUMS+= a0d47c624273b43b4250cff5fa2f9b75e4199ca76897608563b526aedcdf3a16
+CKSUMS+= fcfc15ca30e1f881ed46cf57597a72bd2a8307269d0394c905f23e076a983e12
+CKSUMS+= e6d478786035538d721d88b7736f602c965a38687a805cb377ebbe0ea1a14617
+CKSUMS+= e2b2473bdf7ce5f854fcef6f07f984accc53b4382dba160d625c1fcbaba31612
+
+CKSUM_CRATES+= vendor/openssl-sys-0.9.109
+CKSUMS+= 112fcb6f18b81f31c23c60e7be5fddc87603c05a595f2e22b6e8f7ed2ea89e5f
+CKSUMS+= 023a3e755d7d4c5ca6e4f8ce7a8b1dc2dd1e50cbfcaa43cc6fe809b251ee7037
+CKSUMS+= f66ce762ec63c28621a0d6d48bd5872b96e71f0bfb6f88576a6e2cba0c229e12
+CKSUMS+= 656834a8bd87476b074f36bcc2aeb33a74a0a0a6db5d140c35c4b3eb385afebe
+
+CKSUM_CRATES+= vendor/libc-0.2.155
+CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
+CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
+CKSUMS+= b8d6f089fc8eb2cb59e45335a26c9ce871b846216c9859b553c6b91982f8de33
+CKSUMS+= d8c4a979ce9b406fb63c5aaf2827b616689294331341737fec392b8faa2126fa
+
+CKSUM_CRATES+= vendor/libc-0.2.169
+CKSUMS+= dc216609dfc6b2835e26f8c3e70f4c7c65425933eef04538de603f51e9429ec5
+CKSUMS+= 04004bda0ea97d55c3588a7d82fa1faf0d150c5390250a298216ff3cc899b911
+CKSUMS+= b5dae853ebfc3355b155f8c20f3a481517bce27e164e304f56dfff172e313098
+CKSUMS+= 55fb7f2c0877231286b2b6515e08eda1d5cac1311a402d0aa162c7eb867ee19b
+CKSUMS+= 0b1936bad97b3a272c2d323d3435f6860fc355abe7603ca7ed8c4166cac75cc5
+CKSUMS+= 1eb383a057cdf2826d884b19142bf0b68b6b30c5bc20baf7ee10401a92a8ef22
+
+CKSUM_CRATES+= vendor/libc-0.2.171
+CKSUMS+= f3778a9bd2ba923220537d167cfb10b91580ffbf583100789a46d2807f7a1e3e
+CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
+CKSUMS+= 27feafe043662f005d622502fbb31d99877c1ed8d83b30f350dafcdb513fee69
+CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
+
+CKSUM_CRATES+= vendor/libc-0.2.172
+CKSUMS+= ec4c1dce83e8531df71b89e4aee1ab4d3b3b18d1b6d34b03d94573144c40e7c5
+CKSUMS+= dc3179a14c65c5e3d250ce9819934236f11fc6c9bfa7afa8d4208931d28e4250
+CKSUMS+= f3778a9bd2ba923220537d167cfb10b91580ffbf583100789a46d2807f7a1e3e
+CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
+
+CKSUM_CRATES+= vendor/libc-0.2.174
+CKSUMS+= f3778a9bd2ba923220537d167cfb10b91580ffbf583100789a46d2807f7a1e3e
+CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
+CKSUMS+= 27feafe043662f005d622502fbb31d99877c1ed8d83b30f350dafcdb513fee69
+CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
+
+CKSUM_CRATES+= vendor/libc-0.2.175
+CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
+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+= 1e67f0a4b668858f9326d47c61e868b2a1293296353b7f43ef8487e572b89513
+
+CKSUM_CRATES+= vendor/zerocopy-0.7.32
+CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
+CKSUMS+= abe079743c2b2dea5b2c42564f98741a5eb9e24ff019e01742ace5581e53c06f
+
+CKSUM_CRATES+= vendor/zerocopy-0.7.35
+CKSUMS+= eb5033d1f2f3d5314625bc63353b1d105cb414d4bc68edf8700b401e4055d669
+CKSUMS+= bd504cc95f722a296a5f221c3a3068c9eaa946258beff163581d9492de6ccdce
+
+CKSUM_CRATES+= vendor/memchr-2.7.4
+CKSUMS+= 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0
+CKSUMS+= 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450
+CKSUMS+= 7763472d43c66df596ca0697c07db0b4666d38a6a14f64f9f298aaf756c4a715
+CKSUMS+= 1b26fca824c410077780fbc2f4c53c1d195ba3bdf6785b529ceb0a11f039cec2
+CKSUMS+= 3b15d5cb9715f26e655598eacbb8bbba74cbe8ddb2fb969d13aa75f216a118dd
+CKSUMS+= 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af
+CKSUMS+= 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b
+CKSUMS+= 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0
+CKSUMS+= 44cd1a614bd66f1e66fc86c541d3c3b8d3a14a644c13e8bf816df3f555eac2d4
+CKSUMS+= 27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720
+
+CKSUM_CRATES+= vendor/line-index-0.1.2
+CKSUMS+= c4613b718951cf0b880a3a7829e102a9ec7196591437e3bc0cfd857c717bfb61
+CKSUMS+= 5183e802793932fb980b4e321656c65d1b6231de3febd1ac94dfa73de31245f0
+
+CKSUM_CRATES+= vendor/lzma-sys-0.1.20
+CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
+CKSUMS+= 2a68e3e635dce81c7dba25b3d3abfaa894ee729e1604f2d000ae3e201f7739a4
+
+CKSUM_CRATES+= vendor/zeroize-1.8.1
+CKSUMS+= 9f59308c21265a2fb46935a6468d8bc2e86e4613c9a942fcfc91d61bec8cc878
+CKSUMS+= 9e20af81edc96e11f17c3e3a2933c073b6c6f9b86ca25cab0eabd763c6b80aee
+
+SUBST_CLASSES+= cksum
+SUBST_STAGE.cksum= pre-configure
+.for crate in ${CKSUM_CRATES}
+SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
+.endfor
+.for from to in ${CKSUMS}
+SUBST_SED.cksum+= -e 's,${from},${to},g'
+.endfor
+
+post-extract:
+ set -e; \
+ if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \
+ -a ! -e ${RUST_BOOTSTRAP_PATH}/bin/rustc; then \
+ cd ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}; \
+ env ${MAKE_ENV} ${TOOLS_BASH} \
+ ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \
+ cd ${WRKDIR}/rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}; \
+ env ${MAKE_ENV} ${TOOLS_BASH} \
+ ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \
+ fi
+.if ${OPSYS} == "NetBSD"
+ SDIR=${WRKDIR}/scripts; \
+ ${MKDIR} $${SDIR}; \
+ cd $${SDIR}; \
+ ${RM} -f c++-wrap; \
+ ${RM} -f clang++-wrap; \
+ ${RM} -f clang-wrap; \
+ ${RM} -f ar-wrap; \
+ ${CP} ${.CURDIR}/files/gcc-wrap .; \
+ ${CHMOD} +x gcc-wrap; \
+ ${LN} -s gcc-wrap c++-wrap; \
+ ${LN} -s gcc-wrap clang++-wrap; \
+ ${LN} -s gcc-wrap clang-wrap; \
+ ${LN} -s gcc-wrap ar-wrap
+.endif
+
+.if ${OPSYS} == "FreeBSD"
+MAKE_ENV+= OPENSSL_DIR=${SSLBASE}
+.endif
+
+.if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang) && !exists(/lib/libgcc_s.so)
+BUILDLINK_TRANSFORM+= rm:-lgcc_s
+MAKE_ENV+= PKGSRC_HAVE_LIBCPP=yes
+
+pre-build: provide-libgcc-for-bootstrap
+.PHONY: provide-libgcc-for-bootstrap
+provide-libgcc-for-bootstrap:
+. if exists(${FILESDIR}/libgcc_s.so.1)
+ cp ${FILESDIR}/libgcc_s.so.1 ${RUST_BOOTSTRAP_PATH}/lib/.
+. endif
+.endif
+
+# Rust builds some bundled components with strict version requirements, ensure
+# that any conflicting packages pulled in via dependencies are not buildlinked.
+BUILDLINK_FILES_CMD.xz= ${TRUE}
+MAKE_ENV+= LZMA_API_STATIC=1
+pre-configure:
+ ${RM} -rf ${BUILDLINK_DIR}/include/libssh2*
+
+#
+# These are essentially copies of the "all", "test", and "install" Makefile
+# targets, but are duplicated here so that we can specify -j.
+#
+do-build:
+ ${RUN}${_ULIMIT_CMD} \
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} \
+ sh -c "if [ \"${BUILD_TARGET}\" = \"dist\" ]; then \
+ unset DESTDIR; \
+ ${TOOL_PYTHONBIN} ./x.py \
+ ${BUILD_TARGET} -j ${_MAKE_JOBS_N}; \
+ else \
+ ${TOOL_PYTHONBIN} ./x.py \
+ ${BUILD_TARGET} --stage 2 -j ${_MAKE_JOBS_N} && \
+ ${TOOL_PYTHONBIN} ./x.py \
+ doc --stage 2 -j ${_MAKE_JOBS_N}; \
+ fi"
+
+do-test:
+ ${RUN}${_ULIMIT_CMD} \
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} \
+ ${TOOL_PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
+
+do-install:
+ ${RUN}${_ULIMIT_CMD} \
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
+ ${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 \
+ ${LN} -f $${lib} $${lib##*/}; \
+ done
+.endif
+
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386}
+# Turn off Address space layout randomization
+# so that we can build firefox natively:
+post-install:
+ paxctl +a ${DESTDIR}${PREFIX}/bin/rustc
+.endif
+
+SUBST_CLASSES+= destdir
+SUBST_STAGE.destdir= post-install
+SUBST_FILES.destdir= ${DESTDIR}${PREFIX}/lib/rustlib/manifest-*
+SUBST_SED.destdir= -e 's|file:${DESTDIR}${PREFIX}|file:${PREFIX}|'
+
+GENERATE_PLIST+= ${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
+ ${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
+
+# Create a relocatable stage2 bootstrap from the bits we just built that can be
+# used to build the next version of rust. Currently only tested on SmartOS.
+#
+# Use the alternate BOOTSTRAP_NAME when creating a nightly release.
+#
+#BOOTSTRAP_NAME= ${PKGNAME_NOREV:C/rust/rust-nightly/}-${RUST_ARCH}
+BOOTSTRAP_NAME= ${PKGNAME_NOREV}-${RUST_ARCH}
+BOOTSTRAP_TMPDIR= ${WRKDIR}/${BOOTSTRAP_NAME}
+USE_TOOLS+= gtar
+
+# The NetBSD part is so far untested, because I could not convince
+# the rust build to use the gcc wrapper when building natively,
+# so that I could get a placeholder in the RPATH, because chrpath
+# cannot extend the length of the RPATH...
+ELFEDIT?= /usr/bin/elfedit
+
+.PHONY: stage0-bootstrap
+stage0-bootstrap: install
+ ${RM} -rf ${BOOTSTRAP_TMPDIR}
+ ${MKDIR} ${BOOTSTRAP_TMPDIR}
+.if ${OPSYS} == "NetBSD"
+ (cd ${BOOTSTRAP_TMPDIR}; \
+ DISTDIR=${WRKSRC}/bild/dist; \
+ VER_ARCH=${PKGVERSION}-${RUST_ARCH}; \
+ RUSTC=rustc-$${VER_ARCH}; \
+ RUSTC_FILE=$${RUSTC}.tar.gz; \
+ RUST_STD=rust-std-$${VER_ARCH}; \
+ RUST_STD_FILE=$${RUST_STD}.tar.gz; \
+ ${GTAR} -xzf $${DISTDIR}/$${RUSTC_FILE}; \
+ (cd ${RUSTC}; \
+ RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN/../lib'; \
+ for f in rls-preview/bin/rls rustc/bin/rustc rustc/bin/rustdoc; do \
+ chrpath -r $$RPATH $$f; \
+ done; \
+ RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN'; \
+ for f in rustc/lib/*.so*; do \
+ chrpath -r $$RPATH $$f; \
+ done; \
+ RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN:$$ORIGIN/../../..'; \
+ for f in rustc/lib/rustlib/*/*/*.so*; do \
+ chrpath -r $$RPATH $$f; \
+ done;); \
+ ${GTAR} -czf $${RUSTC_FILE} $${RUSTC}; \
+ ${CP} $${DISTDIR}/$${RUST_STD_FILE} .; \
+ ${ECHO} "Fixed stage0 bootstrap in ${BOOTSTRAP_TMPDIR}:"; \
+ ${ECHO} "$${RUSTC_FILE}"; \
+ ${ECHO} "$${RUST_STD_FILE}"; \
+ )
+.endif
+.if ${OS_VARIANT} == "SmartOS"
+ ${CP} -R ${DESTDIR}${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/
+ ${CP} -R ${DESTDIR}${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/
+ ${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc
+ set -e; \
+ for lib in libgcc_s.so.1 libstdc++.so.6; do \
+ ${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 \
+ libssl.so.3 libz.so.1 libzstd.so.1; do \
+ ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
+ done; \
+ for lib in libiconv.so.2 libidn2.so.0 libintl.so.8 liblber.so.2 \
+ libldap.so.2 liblzma.so.5 libnghttp2.so.14 libsasl2.so.3 \
+ libssh2.so.1 libunistring.so.5 libxml2.so.16; do \
+ ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
+ done; \
+ for f in ${BOOTSTRAP_TMPDIR}/bin/*; do \
+ /bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \
+ ${ELFEDIT} -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \
+ done; \
+ for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \
+ ${ELFEDIT} -e 'dyn:runpath $$ORIGIN' $$f; \
+ done; \
+ for f in ${BOOTSTRAP_TMPDIR}/lib/*.so*; do \
+ ${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/pkgsrc' $$f; \
+ done; \
+ for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/*/*.so* \
+ ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/bin/*; do \
+ ${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \
+ done; \
+ cd ${WRKDIR}; ${GTAR} -zcf ${BOOTSTRAP_NAME}.tar.gz ${BOOTSTRAP_NAME}
+ @${ECHO} ""
+ @${ECHO} "Verify correct library paths using the following:"
+ @${ECHO} ""
+ @${ECHO} " cd ${BOOTSTRAP_TMPDIR}"
+ @${ECHO} " find . -type f | xargs ldd 2>/dev/null | egrep 'not.found|${PREFIX}'"
+ @${ECHO} ""
+ @${ECHO} "If there is no output then this bootstrap kit is ready to go:"
+ @${ECHO} ""
+ @${ECHO} " ${WRKDIR}/${BOOTSTRAP_NAME}.tar.gz"
+ @${ECHO} ""
+.endif
+
+.include "options.mk"
+
+# These dependencies currently use the bundled sources as they require
+# development features not yet available in released versions.
+#
+#.include "../../devel/libgit2/buildlink3.mk"
+#.include "../../security/libssh2/buildlink3.mk"
+#.include "../../www/http-parser/buildlink3.mk"
+#.include "../../devel/jemalloc/buildlink3.mk"
+
+## Issues specific to: bootstrap AND NetBSD follow
+
+# rust i386 and sparc64 bootstraps are built for 8.0
+# and still depend on libstdc++.so.8.
+# Pull in compat80 on 9.x and newer.
+.if (${MACHINE_PLATFORM:MNetBSD-*-i386} || \
+ ${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} || \
+ ${MACHINE_PLATFORM:MNetBSD-*-i386} || \
+ ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || \
+ ${MACHINE_PLATFORM:MNetBSD-*-riscv64}
+# Make libatomic library available via a unique directory:
+DEPENDS+= libatomic-links>=0:../../devel/libatomic-links
+.endif
+
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/tool.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/rust193/buildlink3.mk b/rust193/buildlink3.mk
new file mode 100644
index 0000000000..d932a4d4fe
--- /dev/null
+++ b/rust193/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.18 2025/07/24 10:33:38 jperkin Exp $
+
+BUILDLINK_TREE+= rust
+
+#
+# DO NOT include this directly! Use rust.mk instead.
+#
+
+.if !defined(RUST_BUILDLINK3_MK)
+RUST_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.rust+= rust>=1.56.1
+BUILDLINK_PKGSRCDIR.rust?= ../../wip/rust
+BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/lib/rustlib
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase:= rust
+.include "../../mk/pkg-build-options.mk"
+# XXX: unclear why this is necessary, but is actively harmful on Darwin, and
+# likely broken for most uses anyway as rust defaults to DEPMETHOD=build.
+.if empty(PKG_BUILD_OPTIONS.rust:Mrust-internal-llvm) && ${OPSYS} != "Darwin"
+. include "../../lang/libunwind/buildlink3.mk"
+.endif
+
+.endif
+
+BUILDLINK_TREE+= -rust
diff --git a/rust193/cargo.mk b/rust193/cargo.mk
new file mode 100644
index 0000000000..5eb1aaa9ef
--- /dev/null
+++ b/rust193/cargo.mk
@@ -0,0 +1,121 @@
+# $NetBSD: cargo.mk,v 1.41 2025/04/04 21:29:22 riastradh Exp $
+#
+# Common logic that can be used by packages that depend on cargo crates
+# from crates.io. This lets existing pkgsrc infrastructure fetch and verify
+# cargo crates instead of using the rust package manager in the build phase.
+# Inspired by cargo.mk from FreeBSD ports.
+#
+# Usage example:
+#
+# CARGO_CRATE_DEPENDS+= sha1-0.20
+# .include "../../lang/rust/cargo.mk"
+#
+# If modifying the list of dependencies, re-run the build once without
+# --offline in CARGO_ARGS to generate a new valid Cargo.lock.
+# e.g: make CARGO_ARGS="build --release" build
+#
+# a list of CARGO_CRATE_DEPENDS can be generated via
+# make print-cargo-depends > cargo-depends.mk
+#
+# See also www/geckodriver for a full example.
+
+MASTER_SITES?= -${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download
+
+CHECK_SSP_SUPPORTED= no
+
+.include "../../lang/rust/rust.mk"
+
+USE_TOOLS+= bsdtar digest
+CARGO_VENDOR_DIR= ${WRKDIR}/vendor
+CARGO_WRKSRC?= ${WRKSRC}
+
+# TODO: some Cargo.lock files include git+https sources which need to be fetched from the URL (not necessarily resolving to a crate.io url)
+DISTFILES?= ${DEFAULT_DISTFILES}
+.for crate in ${CARGO_CRATE_DEPENDS}
+DISTFILES+= ${crate}.crate
+. if ${crate:M*+*}
+# E.g., for `curl-sys-0.4.75+curl-8.10.0', we use the URL:
+# https://crates.io/api/v1/crates/curl-sys/0.4.77+curl-8.10.1/download
+SITES.${crate}.crate+= -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*\+.*)$/\1/}/download
+. else
+SITES.${crate}.crate+= -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
+. endif
+EXTRACT_DIR.${crate}.crate?= ${CARGO_VENDOR_DIR}
+.endfor
+
+.include "../../mk/bsd.prefs.mk"
+# Triggers NetBSD ld.so bug (PR toolchain/54192)
+# See Makefile for further information.
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099957
+MAKE_JOBS_SAFE= no
+.endif
+
+post-extract: cargo-vendor-crates
+.PHONY: cargo-vendor-crates
+cargo-vendor-crates:
+ @${STEP_MSG} "Extracting local cargo crates"
+ ${RUN}${MKDIR} ${WRKDIR}/.cargo
+ ${RUN}${PRINTF} "[source.crates-io]\nreplace-with = \"vendored-sources\"\n[source.vendored-sources]\ndirectory = \"${CARGO_VENDOR_DIR}\"\n" > ${WRKDIR}/.cargo/config.toml
+ ${RUN}${MKDIR} ${CARGO_VENDOR_DIR}
+.for crate in ${CARGO_CRATE_DEPENDS}
+ ${RUN}${PRINTF} '{"package":"%s","files":{}}' \
+ `${DIGEST} sha256 < ${_DISTDIR}/${crate}.crate` \
+ > ${CARGO_VENDOR_DIR}/${crate}/.cargo-checksum.json
+.endfor
+
+# Legacy name
+.PHONY: show-cargo-depends
+show-cargo-depends: print-cargo-depends
+
+.PHONY: print-cargo-depends
+print-cargo-depends:
+ ${RUN}${AWK} 'BEGIN {print "# $$Net" "BSD$$"; print;} \
+ /^name = / { split($$3, a, "\""); name=a[2]; } \
+ /^version = / { split($$3, a, "\""); vers=a[2]; } \
+ /^source = / { \
+ print "CARGO_CRATE_DEPENDS+=\t" name "-" vers; \
+ }' ${CARGO_WRKSRC}/Cargo.lock
+
+.if ${RUST_TYPE} == "native"
+CARGO= cargo
+.else
+CARGO= ${PREFIX}/bin/cargo
+.endif
+DEFAULT_CARGO_ARGS= --offline -j${_MAKE_JOBS_N} \
+ ${CARGO_NO_DEFAULT_FEATURES:M[yY][eE][sS]:C/[yY][eE][sS]/--no-default-features/} \
+ ${CARGO_FEATURES:C/.*/--features/W} \
+ ${CARGO_FEATURES:S/ /,/Wg}
+CARGO_ARGS?= build --release ${DEFAULT_CARGO_ARGS}
+CARGO_INSTALL_ARGS?= install --path . --root ${DESTDIR}${PREFIX} ${DEFAULT_CARGO_ARGS}
+
+MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q}
+ALL_ENV+= CARGO_HOME=${WRKDIR}
+
+.if !target(do-build)
+do-build: do-cargo-build
+.endif
+
+.PHONY: do-cargo-build
+do-cargo-build:
+ ${RUN} cd ${CARGO_WRKSRC} && ${SETENV} ${MAKE_ENV} ${CARGO} ${CARGO_ARGS}
+
+.if !target(do-install) && ${GNU_CONFIGURE:Uno:tl} == no
+do-install: do-cargo-install
+.endif
+
+.PHONY: do-cargo-install
+do-cargo-install:
+ ${RUN} cd ${CARGO_WRKSRC} && ${SETENV} ${MAKE_ENV} ${CARGO} ${CARGO_INSTALL_ARGS}
+ # remove files cargo uses for tracking installations
+ ${RM} -f ${DESTDIR}${PREFIX}/.crates.toml
+ ${RM} -f ${DESTDIR}${PREFIX}/.crates2.json
+
+.if ${OPSYS} == "Darwin"
+.PHONY: do-cargo-post-install-darwin-fix-rpath
+post-install: do-cargo-post-install-darwin-fix-rpath
+do-cargo-post-install-darwin-fix-rpath:
+ ${RUN} cd ${DESTDIR}; \
+ for i in $$(${FIND} .${PREFIX}/lib -name '*.so' | ${SED} -e 's|^\./||'); do \
+ install_name_tool -id /$$i $$i; \
+ done
+.endif
diff --git a/rust193/cross.mk b/rust193/cross.mk
new file mode 100644
index 0000000000..26d79473fb
--- /dev/null
+++ b/rust193/cross.mk
@@ -0,0 +1,83 @@
+# $NetBSD: cross.mk,v 1.15 2025/08/25 17:51:11 wiz Exp $
+
+# These settings may be used to cross-build rust.
+#
+# They interact with the files/gcc-wrap script to pick the
+# right compiler for the different phases of the build, and
+# use the headers for the target when required. Note that the
+# cross-root tree will need to have the required binary packages
+# installed (curl etc., see list of buildlink3.mk includes in main
+# Makefile).
+
+# The gcc-wrap / c++-wrap script takes CROSS_ROOT environment variable
+# to do a cross-build. The wrapper script assumes dest/ and tools/
+# as a result of a cross-build of NetBSD as subdirectories of this root
+#CROSS_ROOT= /u/evbarm-armv7hf
+#CROSS_ROOT= /u/evbarm-armv7hf-10.0
+#CROSS_ROOT= /u/evbarm-armv6hf
+#CROSS_ROOT= /u/sparc64
+#CROSS_ROOT= /u/macppc
+#CROSS_ROOT= /u/evbarm64
+#CROSS_ROOT= /u/evbarm64eb
+#CROSS_ROOT= /u/i386
+#CROSS_ROOT= /u/mipsel
+#CROSS_ROOT= /u/riscv64
+#CROSS_ROOT= /
+#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT}
+
+# The GNU cross target designation
+#GNU_CROSS_TARGET= armv7--netbsdelf-eabihf
+#GNU_CROSS_TARGET= armv6--netbsdelf-eabihf
+#GNU_CROSS_TARGET= sparc64--netbsd
+#GNU_CROSS_TARGET= powerpc--netbsd
+#GNU_CROSS_TARGET= aarch64--netbsd
+#GNU_CROSS_TARGET= aarch64_be--netbsd
+#GNU_CROSS_TARGET= i486--netbsdelf
+#GNU_CROSS_TARGET= mipsel--netbsd
+#GNU_CROSS_TARGET= riscv64--netbsd
+#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
+
+# To cross-build rust, you need to specify
+# the ultimate target to built for, as well as the
+# host the compiler is supposed to run on.
+# Rust's target designation
+#TARGET= armv7-unknown-netbsd-eabihf
+#TARGET= armv6-unknown-netbsd-eabihf
+#TARGET= sparc64-unknown-netbsd
+#TARGET= powerpc-unknown-netbsd
+#TARGET= aarch64-unknown-netbsd
+#TARGET= aarch64_be-unknown-netbsd
+#TARGET= i686-unknown-netbsd
+#TARGET= i586-unknown-netbsd
+#TARGET= mipsel-unknown-netbsd
+#TARGET= riscv64gc-unknown-netbsd
+#
+#SCRIPTS= ${WRKDIR}/scripts
+#CONFIGURE_ARGS+= --host=${TARGET}
+#CONFIGURE_ARGS+= --target=${TARGET}
+#CONFIGURE_ARGS+= --set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
+#CONFIGURE_ARGS+= --set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
+#CONFIGURE_ARGS+= --set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
+# Pick one:
+#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
+#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${SCRIPTS}/ar-wrap
+
+# May be required when cross-building on NetBSD
+#MAKE_ENV+= OPENSSL_DIR=/usr
+
+#
+# Cross-compile illumos target. The host is identical, it's just the target
+# that is renamed from x86_64-sun-solaris to x86_64-unknown-illumos.
+#
+#TARGET= x86_64-unknown-illumos
+#
+# Use these variables for "cross-compiling" from x86_64-sun-solaris.
+#
+#CONFIGURE_ARGS+= --set=target.${TARGET}.llvm-config=${LLVM_CONFIG_PATH}
+#CONFIGURE_ARGS+= --host=${TARGET}
+#CONFIGURE_ARGS+= --target=${TARGET}
+#
+# Set this variable when using a native x86_64-unknown-illumos bootstrap, as
+# the build still defaults to x86_64-sun-solaris based on uname.
+#
+#CONFIGURE_ARGS+= --build=${TARGET}
diff --git a/rust193/distinfo b/rust193/distinfo
new file mode 100644
index 0000000000..7d7833f266
--- /dev/null
+++ b/rust193/distinfo
@@ -0,0 +1,172 @@
+$NetBSD: distinfo,v 1.159 2023/06/19 14:46:47 bsiegert Exp $
+
+BLAKE2s (rust-1.91.0-x86_64-unknown-illumos.tar.gz) = 3237bf0d44ebed3251393d09038609fe3546c60d7d07b46eb221ebc4a2784351
+SHA512 (rust-1.91.0-x86_64-unknown-illumos.tar.gz) = def388da51af1335a81280b302694d519779d7c1dd01ff67b02688ef266e8a750e231ca3f88e8c3ef285911b820ec1ca86f1234008f0712352224ab057058ef5
+Size (rust-1.91.0-x86_64-unknown-illumos.tar.gz) = 248339373 bytes
+BLAKE2s (rust-1.92.0-aarch64-apple-darwin.tar.gz) = dc87e78d0fd0084b4980444b8b940a53ec1e88b3b1a863f63a7a76c8a8edafd5
+SHA512 (rust-1.92.0-aarch64-apple-darwin.tar.gz) = 367f2f9c68cac18b7dbe6efec60f110505a1d33a729a43d3d46a14d35d95efa6008ef0e9b87c33c92f8684e965fcac6922347186b0c427dd526ca06ff9883c06
+Size (rust-1.92.0-aarch64-apple-darwin.tar.gz) = 387079070 bytes
+BLAKE2s (rust-1.92.0-aarch64-unknown-linux-gnu.tar.gz) = 18a2557ea554e7c740b74c0038e1f9198a2c59a0c17d46cbc979509049b68435
+SHA512 (rust-1.92.0-aarch64-unknown-linux-gnu.tar.gz) = b327c4229ecfe7f632dbfe7ec2b58ef9cf84c4fc03e98b96cbc04069776634edfb39a1d5ecec0cb2c0fe5b37f6f2578d8319d92c1855b75d62f86f3f53fd327f
+Size (rust-1.92.0-aarch64-unknown-linux-gnu.tar.gz) = 323227370 bytes
+BLAKE2s (rust-1.92.0-aarch64-unknown-netbsd.tar.xz) = f731ae31d9f3d87efa7392b6e1813a50296346f64209060cd30694614b35f350
+SHA512 (rust-1.92.0-aarch64-unknown-netbsd.tar.xz) = 82abcaae4d1e67a829f75f9bcb1c324ef4e0d3b48dc40d2607b4f0a9fdab682fc7d920464730f23e6a4f84eb31d41dd1e51e19d1c0dab6e482ff1b5de9e4d5ef
+Size (rust-1.92.0-aarch64-unknown-netbsd.tar.xz) = 210167120 bytes
+BLAKE2s (rust-1.92.0-arm-unknown-linux-gnueabihf.tar.gz) = acfb4c4f568e5b87272324c241feb842d1dbbb9a7b5c0feed6f7363387a41ec1
+SHA512 (rust-1.92.0-arm-unknown-linux-gnueabihf.tar.gz) = 941146045fac6eeb4807f1dfea19bd4330ee99b95c54d82c8b2363439e084c1a9d17e4f2dec5008640546de77e6ceeceb5e3dbe8c14f6e6f2c14a0cb8201fa81
+Size (rust-1.92.0-arm-unknown-linux-gnueabihf.tar.gz) = 444996252 bytes
+BLAKE2s (rust-1.92.0-armv6-unknown-netbsd-eabihf.tar.xz) = 3879f3d660a9b9b74d6c4c7a450c8582521ebe191bab65001afd19729eee8e77
+SHA512 (rust-1.92.0-armv6-unknown-netbsd-eabihf.tar.xz) = 4716a0ef962f79bd324425e2fa0f966471b9b5c7ba71fed33716c0b3caac3a52dda2a85794b49669dd3776a9f579183202a3869941f150dd3bd259c81c72c7a0
+Size (rust-1.92.0-armv6-unknown-netbsd-eabihf.tar.xz) = 169541724 bytes
+BLAKE2s (rust-1.92.0-armv7-unknown-linux-gnueabihf.tar.gz) = eb8e116844c12d3a5dabb4435e762c628a25c9bcf1ed808473d30f53c86130dc
+SHA512 (rust-1.92.0-armv7-unknown-linux-gnueabihf.tar.gz) = eb441504bb6fb51ec63b7c332710f41b46c86a8db6f225b3114cba1d45222666d288ce334c6b964ff6708d5f1beeeb42c1fdedcbb95120957b6debe3f397910d
+Size (rust-1.92.0-armv7-unknown-linux-gnueabihf.tar.gz) = 429336015 bytes
+BLAKE2s (rust-1.92.0-armv7-unknown-netbsd-eabihf.tar.xz) = 044e88e028fd79c9e7bbe112698db466e0aab7b747f426cceead0651acee3aaf
+SHA512 (rust-1.92.0-armv7-unknown-netbsd-eabihf.tar.xz) = b11a923782de9d023345589d2016d3e731f5f2f593a3b98b23e49307e49adae04c822401e525dc91476f2d884133577a935a943aa8ca3c1d9efb11e57d0fb6d9
+Size (rust-1.92.0-armv7-unknown-netbsd-eabihf.tar.xz) = 172721860 bytes
+BLAKE2s (rust-1.92.0-i586-unknown-netbsd.tar.xz) = aa8cd8fde54768d492d0a13411abd1a5cb14157a21dec5fe3054b22922083b7d
+SHA512 (rust-1.92.0-i586-unknown-netbsd.tar.xz) = d873bce98afb474c5e31fba54ce22f5f9e9805f77ec4aec787c091346b27d69478a82788c6ad1cc752f28c1aa0a1f7f6775def82fe8d764a778bb17022f9852f
+Size (rust-1.92.0-i586-unknown-netbsd.tar.xz) = 231450084 bytes
+BLAKE2s (rust-1.92.0-i686-unknown-linux-gnu.tar.gz) = 14bcd1407ae39b70347147e2db5c6717fce030b770f5b22816c930066fe5a5f0
+SHA512 (rust-1.92.0-i686-unknown-linux-gnu.tar.gz) = 037c65829bd7162fce19b0023137e666e458f3c0aa52c4d99d0add62b6c76664f5c835dd0c7148210ab61b7984941e943f2049340b6bd059f01e6c1abf8bbe7f
+Size (rust-1.92.0-i686-unknown-linux-gnu.tar.gz) = 503930998 bytes
+BLAKE2s (rust-1.92.0-powerpc-unknown-netbsd.tar.xz) = 89fcc471d2a731892f9f53f98cd513bc57421a2589a99c9c1a1784290980dbbe
+SHA512 (rust-1.92.0-powerpc-unknown-netbsd.tar.xz) = f11fcefcae43d6e66af162472390fc3ed1636615a427f38a2609825844fe2c020e922e169d7ec97ccfa8bd952361181b0ec05655a7c2fcbdeea0eac25eaa67cc
+Size (rust-1.92.0-powerpc-unknown-netbsd.tar.xz) = 116673508 bytes
+BLAKE2s (rust-1.92.0-riscv64gc-unknown-netbsd.tar.xz) = 37ef82e3cb5d338f77012534bf915ede3347e18f003f176010c084a7854089d8
+SHA512 (rust-1.92.0-riscv64gc-unknown-netbsd.tar.xz) = fca38c66906531c2def60ac3ea3b476408c51316609b25b28cb34081143670beb0ba4ddc94580ae898a01b73cc3b71059a71954b2e548803d88aa58a2cfb9afe
+Size (rust-1.92.0-riscv64gc-unknown-netbsd.tar.xz) = 227896552 bytes
+BLAKE2s (rust-1.92.0-sparc64-unknown-netbsd.tar.xz) = 97b51baba73fc911f971e8bc69b4981a0c5fa8dd7c6d20f31a24331552511fbc
+SHA512 (rust-1.92.0-sparc64-unknown-netbsd.tar.xz) = 9b6fecd5ffc85f9e30bd0ccf058587d8c235899c25eca8b6e4ffe64200bc783fced337f3554b426d0699b7af3146eec6f31cec52f91ebae4bbddc05fe781d730
+Size (rust-1.92.0-sparc64-unknown-netbsd.tar.xz) = 207705760 bytes
+BLAKE2s (rust-1.92.0-x86_64-apple-darwin.tar.gz) = 1c943db260ee581b72ae35a86ef88fdcfbb2a86dfb03560d96cb24bbdaac94c2
+SHA512 (rust-1.92.0-x86_64-apple-darwin.tar.gz) = 2f9610a73048efac56d2e253eb8b800ee7bb07b279b3cfedd7ce9c35d128572c44b32b10f6be0e21a88b669641bca15170c5230143841e5efe8d370d8809a0ce
+Size (rust-1.92.0-x86_64-apple-darwin.tar.gz) = 335062354 bytes
+BLAKE2s (rust-1.92.0-x86_64-unknown-freebsd.tar.gz) = 74d6bb50e25972151f2eb4b3136266afb0264e83816f600613affe91f9fc687b
+SHA512 (rust-1.92.0-x86_64-unknown-freebsd.tar.gz) = b155df8d148c72056e953014a72cba8192415c05f3374ff802141d1d6654d285b67c3112ca07fe5a9c527b0780341663177429d2a386a2f6e40c2460cdb32d45
+Size (rust-1.92.0-x86_64-unknown-freebsd.tar.gz) = 389139529 bytes
+BLAKE2s (rust-1.92.0-x86_64-unknown-linux-gnu.tar.gz) = d4399a9bc6fdca3913b1467cb248ebeac89e841771a1c5a26c52148bcead2952
+SHA512 (rust-1.92.0-x86_64-unknown-linux-gnu.tar.gz) = f44c27b438fef73d9ce693425d3a956ca321e3a75546416059d868d7a1dfb4c5d6c3954590cde66253782d63ac106bda78bca9e0d19b306adbff3c07d7a5fd27
+Size (rust-1.92.0-x86_64-unknown-linux-gnu.tar.gz) = 371265260 bytes
+BLAKE2s (rust-1.92.0-x86_64-unknown-netbsd.tar.xz) = 6dab4a58d0751f7f5ba659abee127170c00dbb19b4b8bc3fd2460ca21e92232c
+SHA512 (rust-1.92.0-x86_64-unknown-netbsd.tar.xz) = bc5376727735c590716affa14074bf77ff841f2e2d5da2b594a5240057e135695788a5ada4ef27b23802757cfa06bb9a52ccd5697442aa25d8f92eca9042fb38
+Size (rust-1.92.0-x86_64-unknown-netbsd.tar.xz) = 224972620 bytes
+BLAKE2s (rust-std-1.92.0-aarch64-apple-darwin.tar.gz) = e6324c1799d610a225a30e21c77a9c5fe9f7ce430d289b22612db56283578dc7
+SHA512 (rust-std-1.92.0-aarch64-apple-darwin.tar.gz) = 9b404f8a07a890032f72aaec95ea9e3d4b77f58aef18d1d2cc430197a875c6dc79fa88f7a6c7d116953137f7032c4fee88130b6a8bb49646a33ab6e27450a041
+Size (rust-std-1.92.0-aarch64-apple-darwin.tar.gz) = 45831435 bytes
+BLAKE2s (rust-std-1.92.0-aarch64-unknown-linux-gnu.tar.gz) = 9132cae1a466ebee3f91dbce29654af4b34a905b88528cec0aec11a95da1b5fd
+SHA512 (rust-std-1.92.0-aarch64-unknown-linux-gnu.tar.gz) = 6cf581b1d641f045dedb06e29d1a5fffef9d28489a77a0118373349ad0425d3228a472d4084b27d1385a74b0de7b5207249710604ded2671bf20d3978501fd83
+Size (rust-std-1.92.0-aarch64-unknown-linux-gnu.tar.gz) = 50109272 bytes
+BLAKE2s (rust-std-1.92.0-aarch64-unknown-netbsd.tar.xz) = c36a4f0099941438050bad4548e8383d186aa9f0e3c2c60e3810adaa21ea91e1
+SHA512 (rust-std-1.92.0-aarch64-unknown-netbsd.tar.xz) = 376097ed92ea49c872301d7d436762584078759432e38e81b945d34066622e4614c2d7579ea65f2c6935ed85c15c06a8736653122220fc55e867d9960f9004f0
+Size (rust-std-1.92.0-aarch64-unknown-netbsd.tar.xz) = 25858896 bytes
+BLAKE2s (rust-std-1.92.0-arm-unknown-linux-gnueabihf.tar.gz) = fffce7850981b87f65c8962530adc6204b2ffde3704c07e5141536d773e0c84a
+SHA512 (rust-std-1.92.0-arm-unknown-linux-gnueabihf.tar.gz) = c4d8476d488bf051ae88047b45e0c689663df99e97b7be6856094503653897dc2f8c184303abbc5b930a2b88719c75a5f35e3834d23a64d48eeebda909b17a5e
+Size (rust-std-1.92.0-arm-unknown-linux-gnueabihf.tar.gz) = 41965699 bytes
+BLAKE2s (rust-std-1.92.0-armv6-unknown-netbsd-eabihf.tar.xz) = 2ce203dcd6163209275ba85f9d262a88586771f34f29f79f730b9fbd1d3819ed
+SHA512 (rust-std-1.92.0-armv6-unknown-netbsd-eabihf.tar.xz) = b9fbd122585c6ab81d468174fd95e1dd17fda2401e78b952b7eb9b38be68543864697b00be4dec5275abd73493697578d892b671e1523796f22f9003a218b8ee
+Size (rust-std-1.92.0-armv6-unknown-netbsd-eabihf.tar.xz) = 23980688 bytes
+BLAKE2s (rust-std-1.92.0-armv7-unknown-linux-gnueabihf.tar.gz) = 4c9d05d110243c74a76003fe3d9181f73fac3d7d6f7e2af0f86e7f1bfd6eb3e2
+SHA512 (rust-std-1.92.0-armv7-unknown-linux-gnueabihf.tar.gz) = 451c98b033d1145e82bb82b132db3c7d1adb64857a360d6bf2b14a6dc08085b416f2c50c11356f7a3ddeca165a4880e083837988005b4be71acc09edfcc14fa9
+Size (rust-std-1.92.0-armv7-unknown-linux-gnueabihf.tar.gz) = 43500701 bytes
+BLAKE2s (rust-std-1.92.0-armv7-unknown-netbsd-eabihf.tar.xz) = 7a7a4f9dd4238260ad4fc92d2f5960c761ac3cecf2194211b1c9523e8e7d6e59
+SHA512 (rust-std-1.92.0-armv7-unknown-netbsd-eabihf.tar.xz) = 9c7c42a5a19e29bb0c9ad133c92495a1c467152bd5b68e9bab522658e0d649ce164acff8aa2f7ca1e2e29ed19417170984ca3d2e89bb4c9a7a97542b7b23b4a1
+Size (rust-std-1.92.0-armv7-unknown-netbsd-eabihf.tar.xz) = 24916708 bytes
+BLAKE2s (rust-std-1.92.0-i586-unknown-netbsd.tar.xz) = 6bd21ebc0ae4608c7d074aa2c61f60aa96a94566647b75d48e5e931649b7616d
+SHA512 (rust-std-1.92.0-i586-unknown-netbsd.tar.xz) = 585060221b3c0b2258e5b47c2236913b3aae9f0457ca79b80984300237b2defa82a196054d5e0da3645a9bc1fb40cb9341ea07ed44915e4e0afc2bfee813f07b
+Size (rust-std-1.92.0-i586-unknown-netbsd.tar.xz) = 26642564 bytes
+BLAKE2s (rust-std-1.92.0-i686-unknown-linux-gnu.tar.gz) = 158b2d59bbc50184a6ffc5f694a611dc2f1357a25e2ad2c2e81a043f9f728dad
+SHA512 (rust-std-1.92.0-i686-unknown-linux-gnu.tar.gz) = 96d15d8cb607f23f53eb5fda191babdc0deda57f92959741ec80c7a89b93518f9172cfe07296c233364b071e054b504613639b35eeba115b008bb1dc08b6d53f
+Size (rust-std-1.92.0-i686-unknown-linux-gnu.tar.gz) = 46239304 bytes
+BLAKE2s (rust-std-1.92.0-powerpc-unknown-netbsd.tar.xz) = 4c2bd55707502c1cf315edcfce8357eb1a46a1b8cc028c37155c2b6873a70922
+SHA512 (rust-std-1.92.0-powerpc-unknown-netbsd.tar.xz) = ea20e14b70c7cd094c2aa6e29dbde6af515b01a657c57bde39163ffa03e383b496587a827a34cb7f6b439fe54720ad6264b19d2b2f929b137f35e694502bb548
+Size (rust-std-1.92.0-powerpc-unknown-netbsd.tar.xz) = 23877788 bytes
+BLAKE2s (rust-std-1.92.0-riscv64gc-unknown-netbsd.tar.xz) = 79efbb7904c381f50fc0cee6a5f08f28237621e8deaaa098ff587afb02682cd3
+SHA512 (rust-std-1.92.0-riscv64gc-unknown-netbsd.tar.xz) = c23d9745c4fbe3e47e7f706dd6e8c69e2770578df54292b665982fa2c32df8e5f66a9463f714138d9581280738cda4bec759010222f1b14e7d21a93c60a555b8
+Size (rust-std-1.92.0-riscv64gc-unknown-netbsd.tar.xz) = 24216716 bytes
+BLAKE2s (rust-std-1.92.0-sparc64-unknown-netbsd.tar.xz) = af8dfec0be14632a75f4a2a06f3590e76e84d5dfb958404a007bc6e770cac4ce
+SHA512 (rust-std-1.92.0-sparc64-unknown-netbsd.tar.xz) = 75758d95d90ef4aa1901dbaa162379ae07fddfee38857af7d1feb2ed43a11da0adfb8ce0b9d472beb50f20f6cde3bd0c7ac80340afe04ad8db8f085d3ba249aa
+Size (rust-std-1.92.0-sparc64-unknown-netbsd.tar.xz) = 24031280 bytes
+BLAKE2s (rust-std-1.92.0-x86_64-apple-darwin.tar.gz) = 183c5651f46e8331d83820566deffa1fb00c306140bb22151f0468ddf28280cd
+SHA512 (rust-std-1.92.0-x86_64-apple-darwin.tar.gz) = bc02c9bbb1ebc229ea6550bc634654c9f565a49c84ad5c71db649311848dbd5ff3af56aaefb72fd7855d1171e6795643421eb2b6fea615b4252759138593866d
+Size (rust-std-1.92.0-x86_64-apple-darwin.tar.gz) = 48179079 bytes
+BLAKE2s (rust-std-1.92.0-x86_64-unknown-freebsd.tar.gz) = ad6d9af2e5a318ec7850587f262871d8d952e1d4d5a5f2577850e44b6c2a1bad
+SHA512 (rust-std-1.92.0-x86_64-unknown-freebsd.tar.gz) = 835aeb9da22c4056aae072bfb56de0786bea2a568423edae0b1e02b5c054819e1d1cf81b490a3b1b9695bf3c511a7bdc48ed68c4f70304d849b492c569e06070
+Size (rust-std-1.92.0-x86_64-unknown-freebsd.tar.gz) = 49538375 bytes
+BLAKE2s (rust-std-1.92.0-x86_64-unknown-linux-gnu.tar.gz) = 9933807ef2afa77ac0944d3f4696843737c168a663fd247e27dba3049625bcf1
+SHA512 (rust-std-1.92.0-x86_64-unknown-linux-gnu.tar.gz) = 3bd3c89a8690f5a1f9aa0d306191986fa0174a59cc9c01dc637a1486ad4d12154e02580600edeb60c9f5075d98814f1a6d14ffac69300c0b4a9f11de87f958b3
+Size (rust-std-1.92.0-x86_64-unknown-linux-gnu.tar.gz) = 52055344 bytes
+BLAKE2s (rust-std-1.92.0-x86_64-unknown-netbsd.tar.xz) = 947e243c72493cb2f30336437faeed97f00fe1dfb19d707f66c2a00d3042644e
+SHA512 (rust-std-1.92.0-x86_64-unknown-netbsd.tar.xz) = 8e2d543c8fb780d4a025dcf4b2a078bf02bbbb2b064d0ae13673f96e3267887ee55332bec49f29b1e4f164f086d7fe4ac690606536947b8442a19d11b4dbcd0e
+Size (rust-std-1.92.0-x86_64-unknown-netbsd.tar.xz) = 26950044 bytes
+BLAKE2s (rustc-1.93.0-src.tar.gz) = 17b37f993fa7a0d20ac5a2b1630c1063c4709bd36c0eadc47511588cd2314658
+SHA512 (rustc-1.93.0-src.tar.gz) = 6d9bef67f9d25805d9a9bd5aff142f736ecb33b35d179592c41da3da291f10c80ccc8079345bfd2d2fa4107c8d29950b9972b95b7cd034d2985c284f5c87b9d9
+Size (rustc-1.93.0-src.tar.gz) = 640943796 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_base_netbsd.rs) = 4db00d8abecd8f343e3c22c272a8a4e1f9228532
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
+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) = 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_builder_cargo.rs) = b7ce18d045c2ef250817ee4b6ed57e0524d99e71
+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
+SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
+SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 75019dcb3dbca6cda33ba329dbe483101dcf48e7
+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) = 6a664fce0685820df9a1a6593d1d08ab65b9c7db
+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
+SHA1 (patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs) = 97505b88875aa80fa2b5589b6090237c3786e143
+SHA1 (patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c5cd529719daee44aead47ffd97e682ca9d9a1ae
+SHA1 (patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = acbd63b911637fef336a92169a8130133eb64c8c
+SHA1 (patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs) = edbb81319e5f685fd9c2ffe94138c377855a982d
+SHA1 (patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 02c4efefbf1e9e1bd98eb9524515677250ae7454
+SHA1 (patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = c5e1c2d896d5e9d32aeb56bc3e4d9fb26be9edf0
+SHA1 (patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs) = e02c56106a092b4f2e27427ea8b5d96bf437c356
+SHA1 (patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = adfc737db618e2fdbe99aafaee3e7802ee04ca26
+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_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_mod.rs) = f1cfcca26c13242377a3419bd87c1c6aec049086
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = b2508d2e02883f69aba62e00490e2dd376ede2fd
+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
+SHA1 (patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs) = 24bbd69c8b571e5652d5306989b6598b58ec1966
+SHA1 (patch-vendor_memchr-2.7.4_src_memchr.rs) = 4c2f4fa4911f38acd3b36c311abd14d3c9751672
+SHA1 (patch-vendor_memchr-2.7.4_src_memmem_searcher.rs) = a5038873015004ab0c8769dda84edc16a9c55f24
+SHA1 (patch-vendor_memchr-2.7.4_src_vector.rs) = 50a901d061cf58a745b0c387a1c45ff2f0c54e89
+SHA1 (patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf) = 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-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.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) = 4639e4eb655e7a4c3a37ca742fb21c5439bcb370
+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.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
+SHA1 (patch-vendor_zerocopy-0.7.32_src_lib.rs) = d683e48900f427327f4ed518fe62b593e82c13d7
+SHA1 (patch-vendor_zerocopy-0.7.35_src_lib.rs) = b4b910405172f5653db4bf3286974b9410e77fab
+SHA1 (patch-vendor_zeroize-1.8.1_src_lib.rs) = 5e6c3a04e8a4974dc8427b86753bec18fa1aa5fe
diff --git a/rust193/do-cross.mk b/rust193/do-cross.mk
new file mode 100644
index 0000000000..c688545de6
--- /dev/null
+++ b/rust193/do-cross.mk
@@ -0,0 +1,107 @@
+# $NetBSD$
+# Do all the NetBSD cross builds
+# Collect the bootstrap kits in dist/
+
+VERSION!= make show-var VARNAME=PKGVERSION
+V_NOREV!= make show-var VARNAME=PKGVERSION_NOREV
+
+#SHORT_TARGETS+= armv7
+SHORT_TARGETS+= armv6
+SHORT_TARGETS+= sparc64
+SHORT_TARGETS+= powerpc
+SHORT_TARGETS+= arm64
+SHORT_TARGETS+= arm64_be
+SHORT_TARGETS+= i386
+SHORT_TARGETS+= riscv64
+SHORT_TARGETS+= mipsel # produces mips32 (not mips1) executables
+
+# Conditional local overrides of ROOT.* variables:
+.sinclude "local-roots.mk"
+
+# Root of target directories.
+# Must have dest/ (build.sh's DESTDIR) and tools/ subdirectories
+ROOT.armv7?= /u/evbarm-armv7hf
+ROOT.armv6?= /u/evbarm-armv6hf
+ROOT.sparc64?= /u/sparc64
+ROOT.powerpc?= /u/macppc
+ROOT.arm64?= /u/evbarm64
+ROOT.arm64_be?= /u/evbarm64eb
+ROOT.i386?= /u/i386
+ROOT.mipsel?= /u/mipsel
+ROOT.riscv64?= /u/riscv64
+
+# Mapping to GNU triple
+G_TGT.armv7= armv7--netbsdelf-eabihf
+G_TGT.armv6= armv6--netbsdelf-eabihf
+G_TGT.sparc64= sparc64--netbsd
+G_TGT.powerpc= powerpc--netbsd
+G_TGT.arm64= aarch64--netbsd
+G_TGT.arm64_be= aarch64_be--netbsd
+G_TGT.i386= i486--netbsdelf
+G_TGT.mipsel= mipsel--netbsd
+G_TGT.riscv64= riscv64--netbsd
+
+# Mapping to rust's TARGET specification
+TGT.armv7= armv7-unknown-netbsd-eabihf
+TGT.armv6= armv6-unknown-netbsd-eabihf
+TGT.sparc64= sparc64-unknown-netbsd
+TGT.powerpc= powerpc-unknown-netbsd
+TGT.arm64= aarch64-unknown-netbsd
+TGT.arm64_be= aarch64_be-unknown-netbsd
+TGT.i386= i586-unknown-netbsd
+TGT.mipsel= mipsel-unknown-netbsd
+TGT.riscv64= riscv64gc-unknown-netbsd
+
+# Optional target tweak for bootstrap files
+#TT.powerpc= powerpc-unknown-netbsd90
+
+WRKDIR= ${.CURDIR}/work
+SCRIPTS= ${WRKDIR}/scripts
+
+#DEBUG= echo
+
+# Make list of make targets
+.for st in ${SHORT_TARGETS}
+MTGTS+= do-${st}
+.endfor
+
+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
+do-${st}:
+ mkdir -p dist
+ @echo "=======> Cross-building rust for ${st}"
+ ${DEBUG} make -f Makefile clean
+ ${DEBUG} env \
+ CROSS_ROOT=${ROOT.${st}} \
+ GNU_CROSS_TARGET=${G_TGT.${st}} \
+ make -f Makefile \
+ ADD_CONFIGURE_ARGS="${CA.${st}}" \
+ TARGET=${TGT.${st}}
+ if [ "${TT.${st}}" != "" ]; then \
+ TT=${TT.${st}}; \
+ else \
+ TT=${TGT.${st}}; \
+ fi; \
+ distdir=${WRKDIR}/rustc-${V_NOREV}-src/build/dist; \
+ for comp in rust rust-std; do \
+ src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
+ tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
+ if [ ! -f "$${tgt}" ]; then \
+ 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; \
+ ${DEBUG} ln $${distdir}/$${src_comp} dist; \
+ fi
+.endfor
diff --git a/rust193/files/gcc-wrap b/rust193/files/gcc-wrap
new file mode 100644
index 0000000000..48e17d57fb
--- /dev/null
+++ b/rust193/files/gcc-wrap
@@ -0,0 +1,210 @@
+#! /bin/sh
+
+# Root of targets tools + dest directories
+# or unset to default to a native build.
+
+# This script assumes target tools in $root/tools
+# and target's destdir in $root/dest, the result of a NetBSD build.sh.
+# ...or the native root, when we don't cross-compile
+root=${CROSS_ROOT:-/}
+
+incadd=""
+native=false
+if [ $root = "/" ]; then
+ native=true
+else
+ # What's the tools/bin prefix (if we're cross-building)?
+ gnuarch=${GNU_CROSS_TARGET:?}
+
+ # A special hack for netbsd-8 targets.
+ # netbsd-8 has gcc 5.5, but llvm and rust needs >= 7
+ # so we build tools from -9, and try to use that, but
+ # then the include path becomes wrong, and <stdatomic.h>
+ # is no longer picked up automatically by the compiler
+ # from the target destination directory
+ case $gnuarch in
+ sparc64*) incadd="-I=/usr/include/gcc-5"
+ ;;
+
+ # immintrin & from gcc-5 not
+ # compatible with gcc7, apparently
+ i[3456]86*) incadd="-I=/usr/include/gcc-7"
+ ;;
+
+ # mips64 does soft-float
+ mips64*) madd="-msoft-float"
+ ;;
+ powerpc*) # Now needed due to bloat
+ madd="-mlongcall"
+ ;;
+ esac
+ # We build both for -8 and -9 due to ABI differences,
+ # so can't just test $gnuarch... Yes, a vile hack.
+ if [ "$root" = "/u/macppc" ]; then
+ incadd="-I=/usr/include/gcc-5"
+ fi
+fi
+
+# Who are we a wrapper for? (Typically either gcc or c++)
+who=$(basename $0 | sed -e 's/-wrap$//')
+
+args=""
+if [ ! -z "$madd" ]; then
+ args="$args $madd"
+fi
+
+# May need to add $linkadd before first -l or fist -L
+linkadd="-Wl,--sysroot=${root}/dest"
+# (perhaps this is overly cautious, other adjustments we do
+# below may be sufficient...)
+# Lib directories to ensure we search and have in run-path
+libs="/lib /usr/lib /usr/pkg/lib"
+
+for d in $libs; do
+ if ! $native; then
+ linkadd="$linkadd -L=$d"
+ linkadd="$linkadd -Wl,-rpath-link=${root}/dest/$d"
+ fi
+ # Run-path is for when we execute on the target,
+ # so no $root prefix
+ linkadd="$linkadd -Wl,-rpath,$d"
+done
+
+# ...and add a placeholder so we can tweak RPATH with chrpath,
+# since chrpath can't extend the length of the run path
+# (This may also not be needed, we use LD_LIBRARY_PATH instead)
+placeholder="placeholder-$(date | openssl dgst -sha1 | \
+ awk '{ print $2 }')"
+linkadd="$linkadd -Wl,-rpath,/$placeholder"
+# the / is a sneaky attempt to let it past cwrapper...
+
+# More debugging
+linkadd="$linkadd -Wl,--verbose"
+
+linktweaked=false
+
+# Step through args, tweak where required
+set -- "$@"
+while [ $# -gt 0 ]; do
+ case "$1" in
+# Insert = at the front of -isystem args.
+# This is to get --sysroot prepended, so that
+# we pick up the correct set of header files.
+# (I thought this wasn't reqired, but apparently it is...)
+ -isystem)
+ shift
+ case "$1" in
+ # Apparent mis-use of -isystem:
+ */siphash/*)
+ args="$args -I $1"
+ ;;
+ *)
+ args="$args -isystem =$1"
+ ;;
+ esac
+ ;;
+# Also doctor -I directives of known paths and
+# redirect them to the --sysroot.
+ -I/usr/include)
+ args="$args -I=/usr/include"
+ ;;
+ -I/usr/include/krb5)
+ args="$args -I=/usr/include/krb5"
+ ;;
+ -I/usr/pkg/include)
+# Try to drop this...
+ if ! $native; then
+ args="$args -I=/usr/pkg/include"
+ fi
+ ;;
+ -I)
+ if [ $2 = "/usr/include" ]; then
+ args="$args -I=/usr/include"
+ shift
+ elif [ $2 = "/usr/include/krb5" ]; then
+ args="$args -I=/usr/include/krb5"
+ shift
+ elif [ $2 = "/usr/pkg/include" ]; then
+# Try to drop this too...
+ if ! $native; then
+ args="$args -I=/usr/pkg/include"
+ fi
+ shift
+ else
+ args="$args -I"
+ fi
+ ;;
+ -l*)
+ if ! $linktweaked; then
+ args="$args $linkadd"
+ linktweaked=true
+ fi
+ args="$args $1"
+ ;;
+ -L)
+ if ! $linktweaked; then
+ args="$args $linkadd"
+ linktweaked=true
+ fi
+ shift
+ tweaked=false
+ # redirect these to -Wl,--sysroot
+ for d in /lib /usr/lib /usr/pkg/lib; do
+ if [ $1 = $d ]; then
+ args="$args -L =$d"
+ tweaked=true
+ fi
+ done
+ # Not redirected? If so we need to add
+ if ! $tweaked; then
+ args="$args -L $1"
+ fi
+ ;;
+
+ -L/lib)
+ if ! $linktweaked; then
+ args="$args $linkadd"
+ linktweaked=true
+ fi
+ args="$args -L=/lib"
+ ;;
+ -L/usr/lib)
+ if ! $linktweaked; then
+ args="$args $linkadd"
+ linktweaked=true
+ fi
+ args="$args -L=/usr/lib"
+ ;;
+ -L/usr/pkg/lib)
+ if ! $linktweaked; then
+ args="$args $linkadd"
+ linktweaked=true
+ fi
+ args="$args -L=/usr/pkg/lib"
+ ;;
+ -Wl,--enable-new-dtags)
+ # ignore
+ ;;
+ *)
+ args="$args $1"
+ ;;
+ esac
+ shift
+done
+
+if $native; then
+ # Try to avoid cwrappers, which does "undocumented magic"
+ # by invoking the compiler "directly".
+ #cmd="/usr/bin/${who} $args"
+ # (however, this wrapper isn't used when buliding natively...)
+ cmd="${who} $args"
+else
+ cmd="${root}/tools/bin/${gnuarch}-${who} \
+ --sysroot=${root}/dest \
+ $incadd \
+ $args"
+fi
+
+# Cannot echo to stdout, messes up e.g. "gcc -print-prog-name=ld" output...
+#echo $cmd >> /tmp/gcc-wrap.log
+exec $cmd
diff --git a/rust193/options.mk b/rust193/options.mk
new file mode 100644
index 0000000000..569bc27ee0
--- /dev/null
+++ b/rust193/options.mk
@@ -0,0 +1,116 @@
+# $NetBSD: options.mk,v 1.49 2025/08/25 17:51:11 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.rust
+PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# The bundled LLVM current has issues building on SunOS.
+.if ${OPSYS} != "SunOS"
+PKG_SUPPORTED_OPTIONS+= rust-internal-llvm
+# There may be compatibility issues with the base LLVM on e.g. NetBSD.
+. if !empty(HAVE_LLVM)
+PKG_SUGGESTED_OPTIONS+= rust-internal-llvm
+. endif
+.endif
+
+# If cross-building, always use the internal LLVM
+.if !empty(TARGET)
+PKG_SUGGESTED_OPTIONS+= rust-internal-llvm
+.endif
+
+# Rust 1.92.0 needs llvm >= 20, so if we're still on older...
+LLVM_VERSION!= awk '/^LLVM_VERSION/ { print $$2 }' ../../lang/llvm/version.mk
+.if !empty(LLVM_VERSION:M1[0-9].*)
+PKG_SUGGESTED_OPTIONS+= rust-internal-llvm
+.endif
+
+PKG_OPTIONS_LEGACY_OPTS+= rust-llvm:rust-internal-llvm
+
+# Bundle OpenSSL and curl into the cargo binary when producing
+# bootstraps on NetBSD.
+.if ${OPSYS} == "NetBSD" && ${BUILD_TARGET} == "dist"
+PKG_SUGGESTED_OPTIONS+= rust-cargo-static
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+# NetBSD/sparc64 when using the internal LLVM needs
+# to not use gcc 10.4 or 10.5 (as found in 10.0_BETA or 10.0), ref.
+# https://github.com/rust-lang/rust/issues/117231
+# (however, gcc from 9.x produces a working LLVM, go figure).
+.if ${MACHINE_PLATFORM:MNetBSD-10.*-sparc64}
+. if !empty(PKG_OPTIONS:Mrust-internal-llvm)
+# Require GCC 12 (from pkgsrc) to correctly build the embedded LLVM (18.x).
+GCC_REQD+= 12
+. endif
+.endif
+
+# Apparently, using pkgsrc LLVM 19.x does not work on
+# NetBSD/x86_64 9.x and NetBSD/i386 9.x unless rust is built
+# with a newer gcc than the platform-included 7.5.0. Ref.
+# https://gnats.netbsd.org/59435 and
+# https://mail-index.netbsd.org/pkgsrc-users/2025/05/20/msg041603.html
+# and following discussion.
+.if empty(PKG_OPTIONS:Mrust-internal-llvm)
+. if ${MACHINE_PLATFORM:MNetBSD-9.*-x86_64} || \
+ ${MACHINE_PLATFORM:MNetBSD-9.*-i386}
+GCC_REQD+= 10
+. endif
+.endif
+
+# Fix for problem seen during rust-installer run w/rust 1.84.1 on macppc,
+# "of course" experienced near the end of the build process:
+# assertion "memcmp(mf_ptr(mf) - 1, mf_ptr(mf) - matches[i].dist - 2, matches[i].len) == 0" failed: file "xz-5.2/src/liblzma/lz/lz_encoder_mf.c", line 40, function "lzma_mf_find"
+# The above is seen with both in-tree gcc (10.5.0) and gcc12 from pkgsrc.
+.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc}
+GCC_REQD+= 14
+.endif
+
+#
+# Use the internal copy of LLVM or the external one?
+#
+.if empty(PKG_OPTIONS:Mrust-internal-llvm)
+BUILDLINK_API_DEPENDS.llvm+= llvm>=18.0.0
+.include "../../lang/libunwind/buildlink3.mk"
+.include "../../lang/llvm/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-llvm-link-shared
+CONFIGURE_ARGS+= --llvm-libunwind=system
+CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm}
+# Also turn off build of the internal LLD, as the external LLVM
+# may be older (e.g. 18) than the internal LLD (now 19.x), ref.
+# https://github.com/rust-lang/rust/issues/131291
+CONFIGURE_ARGS+= --set rust.lld=false
+.endif
+
+#
+# Link cargo statically against "native" libraries.
+# (openssl and curl specifically).
+#
+.if !empty(PKG_OPTIONS:Mrust-cargo-static)
+CONFIGURE_ARGS+= --enable-cargo-native-static
+.else
+BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0
+BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
+.include "../../www/curl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
+# Work around https://github.com/rust-lang/rust/issues/148497
+# 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} || \
+ (!empty(TARGET) && ${TARGET:Mpowerpc-*})
+CONFIGURE_ARGS+= --tools="cargo,clippy,rustdoc,rustfmt,analysis,src,wasm-component-ld"
+# rust-analyzer dropped from list
+.endif
+
+#
+# Install documentation.
+#
+.if !empty(PKG_OPTIONS:Mrust-docs)
+CONFIGURE_ARGS+= --enable-docs
+.else
+CONFIGURE_ARGS+= --disable-docs
+.endif
diff --git a/rust193/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/rust193/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
new file mode 100644
index 0000000000..8fd4710a16
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Do not use @rpath on Darwin.
+Find external libunwind on Linux.
+
+--- 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
+@@ -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 {
+- let mut rpath = OsString::from("@rpath/");
++ let mut rpath = OsString::from("@PREFIX@/lib/");
+ rpath.push(out_filename.file_name().unwrap());
+ self.link_arg("-install_name").link_arg(rpath);
+ }
+@@ -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.llvm_target.contains("linux") && name == "unwind" {
++ self.link_arg("-R@PREFIX@/lib");
++ self.link_arg("-L@PREFIX@/lib");
++ }
+ 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.
diff --git a/rust193/patches/patch-compiler_rustc__llvm_build.rs b/rust193/patches/patch-compiler_rustc__llvm_build.rs
new file mode 100644
index 0000000000..74346dbe8e
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__llvm_build.rs
@@ -0,0 +1,50 @@
+$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
+
+Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
+
+Pick up -latomic tweak from
+https://github.com/rust-lang/rust/issues/104220
+and
+https://github.com/rust-lang/rust/pull/104572
+
+--- compiler/rustc_llvm/build.rs.orig 2023-10-03 02:52:17.000000000 +0000
++++ compiler/rustc_llvm/build.rs
+@@ -249,6 +249,10 @@ fn main() {
+ {
+ // 32-bit targets need to link libatomic.
+ println!("cargo:rustc-link-lib=atomic");
++ if target.contains("netbsd")
++ {
++ println!("cargo:rustc-link-lib=z");
++ }
+ } else if target.contains("windows-gnu") {
+ println!("cargo:rustc-link-lib=shell32");
+ println!("cargo:rustc-link-lib=uuid");
+@@ -261,7 +265,11 @@ fn main() {
+ // On NetBSD/i386, gcc and g++ is built for i486 (to maximize backward compat)
+ // However, LLVM insists on using 64-bit atomics.
+ // This gives rise to a need to link rust itself with -latomic for these targets
+- if target.starts_with("i586") || target.starts_with("i686") {
++ if target.starts_with("i386")
++ || target.starts_with("i486")
++ || target.starts_with("i586")
++ || target.starts_with("i686")
++ {
+ println!("cargo:rustc-link-lib=atomic");
+ }
+ println!("cargo:rustc-link-lib=z");
+@@ -352,7 +360,13 @@ fn main() {
+ "c++"
+ } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
+ // NetBSD uses a separate library when relocation is required
+- "stdc++_p"
++ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
++ "c++_pic"
++ } else {
++ "stdc++_pic"
++ }
++ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
++ "c++"
+ } else if llvm_use_libcxx.is_some() {
+ "c++"
+ } else {
diff --git a/rust193/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
new file mode 100644
index 0000000000..90f4b467c7
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
@@ -0,0 +1,32 @@
+$NetBSD$
+
+For the benefit of powerpc, when libatomic-links is installed,
+search the directory containing the symlinks to -latomic.
+
+--- 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::{Os, RelroLevel, TargetOptions, cvs};
++use crate::spec::{Cc, Lld, LinkerFlavor, Os, RelroLevel, TargetOptions, cvs};
+
+ pub(crate) fn opts() -> TargetOptions {
++ let add_linker_paths =
++ &[
++ // For the benefit of powerpc, when libatomic-links is installed,
++ "-Wl,-R@PREFIX@/lib/libatomic",
++ "-Wl,-L@PREFIX@/lib/libatomic",
++ ];
++ let pre_link_args = TargetOptions::link_args(
++ LinkerFlavor::Gnu(Cc::Yes, Lld::No),
++ add_linker_paths
++ );
+ TargetOptions {
+ os: Os::NetBsd,
+ dynamic_linking: true,
+ families: cvs!["unix"],
+ no_default_libraries: false,
+ has_rpath: true,
++ pre_link_args,
+ position_independent_executables: true,
+ relro_level: RelroLevel::Full,
+ has_thread_local: true,
diff --git a/rust193/patches/patch-compiler_rustc__target_src_spec_mod.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_mod.rs
new file mode 100644
index 0000000000..48bba380a5
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
+
+Add entry for NetBSD/mips64el.
+
+--- compiler/rustc_target/src/spec/mod.rs.orig 2024-01-13 14:20:59.236278792 +0000
++++ compiler/rustc_target/src/spec/mod.rs
+@@ -1532,6 +1532,7 @@ supported_targets! {
+ ("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
+ ("i586-unknown-netbsd", i586_unknown_netbsd),
+ ("i686-unknown-netbsd", i686_unknown_netbsd),
++ ("mips64el-unknown-netbsd", mips64el_unknown_netbsd),
+ ("mipsel-unknown-netbsd", mipsel_unknown_netbsd),
+ ("powerpc-unknown-netbsd", powerpc_unknown_netbsd),
+ ("riscv64gc-unknown-netbsd", riscv64gc_unknown_netbsd),
diff --git a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
new file mode 100644
index 0000000000..64f75d7aa0
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+NetBSD aarch64 has a bug in the thread-local storage implementation,
+ref. PR#58154. Turn it off for now.
+Ideally should check whether the version has the fix or not, but
+e.g. __NetBSD_Version__ isn't easily available here that I know...
+
+--- compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs.orig 2024-07-23 19:21:34.344805113 +0000
++++ compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs
+@@ -18,6 +18,7 @@ pub fn target() -> Target {
+ max_atomic_width: Some(128),
+ stack_probes: StackProbeType::Inline,
+ endian: Endian::Big,
++ has_thread_local: false, // ref. NetBSD PR#58154
+ ..base::netbsd::opts()
+ },
+ }
diff --git a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
new file mode 100644
index 0000000000..870b6f0931
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+NetBSD aarch64 has a bug in the thread-local storage implementation,
+ref. PR#58154. Turn it off for now.
+Ideally should check whether the version has the fix or not, but
+e.g. __NetBSD_Version__ isn't easily available here that I know...
+
+--- compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs.orig 2024-07-23 19:18:44.116841966 +0000
++++ compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs
+@@ -17,6 +17,7 @@ pub fn target() -> Target {
+ mcount: "__mcount".into(),
+ max_atomic_width: Some(128),
+ stack_probes: StackProbeType::Inline,
++ has_thread_local: false, // ref. NetBSD PR#58154
+ ..base::netbsd::opts()
+ },
+ }
diff --git a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
new file mode 100644
index 0000000000..18383b7a1d
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
@@ -0,0 +1,39 @@
+$NetBSD$
+
+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,32 @@
++//! A target tuple for NetBSD/mips64
++
++use rustc_abi::Endian;
++
++use crate::spec::{Abi, Arch, Target, TargetMetadata, TargetOptions, base};
++
++pub(crate) fn target() -> Target {
++ let mut base = base::netbsd::opts();
++ base.max_atomic_width = Some(32);
++ base.cpu = "mips32".into();
++
++ Target {
++ llvm_target: "mipsel-unknown-netbsd".into(),
++ 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: Arch::Mips64,
++ options: TargetOptions {
++ abi: Abi::ElfV2,
++ endian: Endian::Little,
++ features: "+soft-float,+abi=n32".into(),
++ llvm_abiname: "n32".into(),
++ mcount: "__mcount".into(),
++ ..base
++ },
++ }
++}
diff --git a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
new file mode 100644
index 0000000000..9f9b89dbe0
--- /dev/null
+++ b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Let's see if turning off thread local storage makes a difference...
+
+--- compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs.orig 2024-08-05 20:02:56.368978562 +0000
++++ compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs
+@@ -21,6 +21,7 @@ pub fn target() -> Target {
+ features: "+soft-float".into(),
+ mcount: "__mcount".into(),
+ endian: Endian::Little,
++ has_thread_local: false, // Let's see if there's a difference...
+ ..base
+ },
+ }
diff --git a/rust193/patches/patch-library_backtrace_src_symbolize_gimli.rs b/rust193/patches/patch-library_backtrace_src_symbolize_gimli.rs
new file mode 100644
index 0000000000..9084324dd8
--- /dev/null
+++ b/rust193/patches/patch-library_backtrace_src_symbolize_gimli.rs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add NetBSD to the family who is in the unix class.
+
+--- library/backtrace/src/symbolize/gimli.rs.orig 2006-07-24 01:21:28.000000000 +0000
++++ library/backtrace/src/symbolize/gimli.rs
+@@ -40,6 +40,7 @@ cfg_if::cfg_if! {
+ target_os = "haiku",
+ target_os = "hurd",
+ target_os = "linux",
++ target_os = "netbsd",
+ target_os = "openbsd",
+ target_os = "solaris",
+ target_os = "illumos",
diff --git a/rust193/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs b/rust193/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
new file mode 100644
index 0000000000..f49e07d14f
--- /dev/null
+++ b/rust193/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
@@ -0,0 +1,26 @@
+$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.8 2024/04/18 09:29:42 pin Exp $
+
+Make NetBSD also find its debug libraries, if present.
+
+--- library/backtrace/src/symbolize/gimli/elf.rs.orig 2022-04-04 09:41:26.000000000 +0000
++++ library/backtrace/src/symbolize/gimli/elf.rs
+@@ -395,11 +395,18 @@ fn decompress_zstd(mut input: &[u8], mut
+ Some(())
+ }
+
++#[cfg(target_os = "netbsd")]
++const DEBUG_PATH: &str = "/usr/libdata/debug";
++#[cfg(not(target_os = "netbsd"))]
+ const DEBUG_PATH: &str = "/usr/lib/debug";
+
+ fn debug_path_exists() -> bool {
+ cfg_if::cfg_if! {
+- if #[cfg(any(target_os = "freebsd", target_os = "hurd", target_os = "linux"))] {
++ if #[cfg(any(target_os = "freebsd",
++ target_os = "netbsd",
++ target_os = "hurd",
++ target_os = "linux"
++ ))] {
+ use core::sync::atomic::{AtomicU8, Ordering};
+ static DEBUG_PATH_EXISTS: AtomicU8 = AtomicU8::new(0);
+
diff --git a/rust193/patches/patch-library_std_src_sys_fs_unix.rs b/rust193/patches/patch-library_std_src_sys_fs_unix.rs
new file mode 100644
index 0000000000..d5ff1277c8
--- /dev/null
+++ b/rust193/patches/patch-library_std_src_sys_fs_unix.rs
@@ -0,0 +1,86 @@
+$NetBSD$
+
+Support flock() on illumos.
+
+--- library/std/src/sys/fs/unix.rs.orig 2025-11-06 19:54:02.066156844 +0000
++++ library/std/src/sys/fs/unix.rs
+@@ -1282,6 +1282,7 @@ impl File {
+ #[cfg(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1305,6 +1306,7 @@ impl File {
+ #[cfg(not(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1319,6 +1321,7 @@ impl File {
+ #[cfg(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1342,6 +1345,7 @@ impl File {
+ #[cfg(not(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1356,6 +1360,7 @@ impl File {
+ #[cfg(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1395,6 +1400,7 @@ impl File {
+ #[cfg(not(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1412,6 +1418,7 @@ impl File {
+ #[cfg(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1451,6 +1458,7 @@ impl File {
+ #[cfg(not(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1468,6 +1476,7 @@ impl File {
+ #[cfg(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+@@ -1491,6 +1500,7 @@ impl File {
+ #[cfg(not(any(
+ target_os = "freebsd",
+ target_os = "fuchsia",
++ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
diff --git a/rust193/patches/patch-src_bootstrap_bootstrap.py b/rust193/patches/patch-src_bootstrap_bootstrap.py
new file mode 100644
index 0000000000..5ef63731ca
--- /dev/null
+++ b/rust193/patches/patch-src_bootstrap_bootstrap.py
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Use `uname -p` on NetBSD, as that is reliable and sensible there.
+Use @PREFIX@ and not $ORIGIN in rpath.
+
+--- src/bootstrap/bootstrap.py.orig 2025-10-28 16:34:16.000000000 +0000
++++ src/bootstrap/bootstrap.py
+@@ -330,6 +330,11 @@ def default_build_triple(verbose):
+ "GNU": "unknown-hurd",
+ }
+
++ # For NetBSD, use `uname -p`, as there it is reliable & sensible
++ if kernel == 'NetBSD':
++ cputype = subprocess.check_output(
++ ['uname', '-p']).strip().decode(default_encoding)
++
+ # Consider the direct transformation first and then the special cases
+ if kernel in kerneltype_mapper:
+ kernel = kerneltype_mapper[kernel]
+@@ -706,11 +711,11 @@ class RustBuild(object):
+ )
+ p = Pool(pool_size)
+ try:
+- # FIXME: A cheap workaround for https://github.com/rust-lang/rust/issues/125578,
+- # remove this once the issue is closed.
+- bootstrap_build_artifacts = os.path.join(self.bootstrap_out(), "debug")
+- if os.path.exists(bootstrap_build_artifacts):
+- shutil.rmtree(bootstrap_build_artifacts)
++# # FIXME: A cheap workaround for https://github.com/rust-lang/rust/issues/125578,
++# # remove this once the issue is closed.
++# bootstrap_build_artifacts = os.path.join(self.bootstrap_out(), "debug")
++# if os.path.exists(bootstrap_build_artifacts):
++# shutil.rmtree(bootstrap_build_artifacts)
+
+ p.map(unpack_component, tarballs_download_info)
+ finally:
+@@ -857,7 +862,10 @@ class RustBuild(object):
+ self.nix_deps_dir = nix_deps_dir
+
+ patchelf = "{}/bin/patchelf".format(nix_deps_dir)
+- rpath_entries = [os.path.join(os.path.realpath(nix_deps_dir), "lib")]
++ rpath_entries = [
++ "@PREFIX@/lib",
++ os.path.join(os.path.realpath(nix_deps_dir), "lib")
++ ]
+ patchelf_args = ["--add-rpath", ":".join(rpath_entries)]
+ if ".so" not in fname:
+ # Finally, set the correct .interp for binaries
diff --git a/rust193/patches/patch-src_bootstrap_src_core_build__steps_compile.rs b/rust193/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
new file mode 100644
index 0000000000..92eee78647
--- /dev/null
+++ b/rust193/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.2 2024/04/18 09:29:42 pin Exp $
+
+On Darwin, do not use @rpath for internal libraries.
+
+--- src/bootstrap/src/core/build_steps/compile.rs.orig 2024-01-06 20:42:20.028206400 +0000
++++ src/bootstrap/src/core/build_steps/compile.rs
+@@ -695,7 +695,7 @@ fn copy_sanitizers(
+ || target == "x86_64-apple-ios"
+ {
+ // Update the library’s install name to reflect that it has been renamed.
+- apple_darwin_update_library_name(builder, &dst, &format!("@rpath/{}", runtime.name));
++ apple_darwin_update_library_name(builder, &dst, &format!("@PREFIX@/lib/{}", runtime.name));
+ // Upon renaming the install name, the code signature of the file will invalidate,
+ // so we will sign it again.
+ apple_darwin_sign_file(builder, &dst);
diff --git a/rust193/patches/patch-src_bootstrap_src_core_build__steps_install.rs b/rust193/patches/patch-src_bootstrap_src_core_build__steps_install.rs
new file mode 100644
index 0000000000..3e456035c5
--- /dev/null
+++ b/rust193/patches/patch-src_bootstrap_src_core_build__steps_install.rs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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
+@@ -206,7 +206,7 @@ macro_rules! install {
+ install!((self, builder, _config),
+ Docs, path = "src/doc", _config.docs, IS_HOST: false, {
+ let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
+- install_sh(builder, "docs", self.build_compiler, Some(self.target), &tarball);
++ install_sh(builder, "rust", self.build_compiler, Some(self.target), &tarball);
+ };
+ Std, path = "library/std", true, IS_HOST: false, {
+ // `expect` should be safe, only None when host != build, but this
diff --git a/rust193/patches/patch-src_bootstrap_src_core_builder_cargo.rs b/rust193/patches/patch-src_bootstrap_src_core_builder_cargo.rs
new file mode 100644
index 0000000000..0580e7f16a
--- /dev/null
+++ b/rust193/patches/patch-src_bootstrap_src_core_builder_cargo.rs
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Find external libunwind and libLLVM in pkgsrc (not just Linux).
+Use @PREFIX@ in rpath.
+
+--- src/bootstrap/src/core/builder/cargo.rs.orig 2025-01-27 23:20:59.000000000 +0000
++++ src/bootstrap/src/core/builder/cargo.rs
+@@ -251,7 +251,7 @@ impl Cargo {
+ && !target.contains("xous")
+ {
+ self.rustflags.arg("-Clink-args=-Wl,-z,origin");
+- Some(format!("-Wl,-rpath,$ORIGIN/../{libdir}"))
++ Some(format!("-Wl,-rpath,@PREFIX@/lib"))
+ } else {
+ None
+ };
+@@ -1249,6 +1249,9 @@ impl Builder<'_> {
+ // cargo bench/install do not accept `--release` and miri doesn't want it
+ !matches!(cmd_kind, Kind::Bench | Kind::Install | Kind::Miri | Kind::MiriSetup | Kind::MiriTest);
+
++ // added for pkgsrc libunwind or external LLVM
++ rustflags.arg("-Clink-args=-Wl,-rpath,@PREFIX@/lib,-L@PREFIX@/lib");
++
+ Cargo {
+ command: cargo,
+ args: vec![],
diff --git a/rust193/patches/patch-src_bootstrap_src_lib.rs b/rust193/patches/patch-src_bootstrap_src_lib.rs
new file mode 100644
index 0000000000..9f8eabe566
--- /dev/null
+++ b/rust193/patches/patch-src_bootstrap_src_lib.rs
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_bootstrap_src_lib.rs,v 1.10 2026/01/14 06:44:31 wiz Exp $
+
+Don't filter out optimization flags.
+FreeBSD has a particular C++ runtime library name.
+Don't assume files in ${PREFIX}/lib are readable by the building user.
+
+--- src/bootstrap/src/lib.rs.orig 2025-09-14 15:05:11.000000000 +0000
++++ src/bootstrap/src/lib.rs
+@@ -1256,7 +1256,6 @@ impl Build {
+ base.args()
+ .iter()
+ .map(|s| s.to_string_lossy().into_owned())
+- .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
+ .collect::<Vec<String>>()
+ }
+
+@@ -1272,7 +1271,8 @@ impl Build {
+ // If we're compiling C++ on macOS then we add a flag indicating that
+ // we want libc++ (more filled out than libstdc++), ensuring that
+ // LLVM/etc are all properly compiled.
+- if matches!(c, CLang::Cxx) && target.contains("apple-darwin") {
++ if matches!(c, CLang::Cxx) &&
++ (target.contains("apple-darwin") || target.contains("freebsd")) {
+ base.push("-stdlib=libc++".into());
+ }
+
+@@ -1813,7 +1813,12 @@ impl Build {
+ // but if that fails just fall back to a slow `copy` operation.
+ } else {
+ if let Err(e) = fs::copy(&src, dst) {
+- panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
++ if e.kind() == io::ErrorKind::PermissionDenied {
++ eprintln!("Skipping copy of `{}` to `{}`: {}", src.display(), dst.display(), e);
++ return;
++ } else {
++ panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
++ }
+ }
+ t!(fs::set_permissions(dst, metadata.permissions()));
+
diff --git a/rust193/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/rust193/patches/patch-src_llvm-project_llvm_CMakeLists.txt
new file mode 100644
index 0000000000..c175e399cb
--- /dev/null
+++ b/rust193/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.14 2024/04/18 09:29:42 pin Exp $
+
+Don't implement sys/regset.h workaround, fix source instead.
+
+--- src/llvm-project/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000
++++ src/llvm-project/llvm/CMakeLists.txt
+@@ -1225,11 +1225,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+ # (this is a variable that CrossCompile sets on recursive invocations)
+ endif()
+
+-if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
+- # special hack for Solaris to handle crazy system sys/regset.h
+- include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
+-endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
+-
+ # Make sure we don't get -rdynamic in every binary. For those that need it,
+ # use EXPORT_SYMBOLS argument.
+ set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
diff --git a/rust193/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake b/rust193/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
new file mode 100644
index 0000000000..6a701cd3aa
--- /dev/null
+++ b/rust193/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.15 2024/04/18 09:29:42 pin Exp $
+
+On Darwin, use correct install-name for shared libraries.
+
+Undo some of the RPATH magic so that cross-building
+works inside pkgsrc again (indirectly eliminates $ORIGIN rpath
+handling / editing, $ORIGIN handling is partially undone by cwrappers
+in pkgsrc).
+
+--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig 2023-07-12 03:33:01.000000000 +0000
++++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
+@@ -2311,7 +2311,7 @@ function(llvm_setup_rpath name)
+ endif()
+
+ if (APPLE)
+- set(_install_name_dir INSTALL_NAME_DIR "@rpath")
++ set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+ set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
+ # $ORIGIN is not interpreted at link time by aix ld.
+@@ -2320,8 +2320,7 @@ function(llvm_setup_rpath name)
+ # FIXME: update this when there is better solution.
+ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+ elseif(UNIX)
+- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
++ set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+ if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
+ set_property(TARGET ${name} APPEND_STRING PROPERTY
+ LINK_FLAGS " -Wl,-z,origin ")
+@@ -2335,16 +2334,9 @@ function(llvm_setup_rpath name)
+ return()
+ endif()
+
+- # Enable BUILD_WITH_INSTALL_RPATH unless CMAKE_BUILD_RPATH is set and not
+- # building for macOS or AIX, as those platforms seemingly require it.
+- # On AIX, the tool chain doesn't support modifying rpaths/libpaths for XCOFF
+- # on install at the moment, so BUILD_WITH_INSTALL_RPATH is required.
++ # Enable BUILD_WITH_INSTALL_RPATH unless CMAKE_BUILD_RPATH is set.
+ if("${CMAKE_BUILD_RPATH}" STREQUAL "")
+- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin|AIX")
+- set_property(TARGET ${name} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
+- else()
+- set_property(TARGET ${name} APPEND PROPERTY BUILD_RPATH "${_build_rpath}")
+- endif()
++ set_property(TARGET ${name} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
+ endif()
+
+ set_target_properties(${name} PROPERTIES
diff --git a/rust193/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h b/rust193/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
new file mode 100644
index 0000000000..8722fdfe38
--- /dev/null
+++ b/rust193/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.8 2024/04/18 09:29:42 pin Exp $
+
+Don't implement sys/regset.h workaround, fix source instead.
+
+--- src/llvm-project/llvm/include/llvm-c/DataTypes.h.orig 2021-04-17 01:50:37.000000000 +0000
++++ src/llvm-project/llvm/include/llvm-c/DataTypes.h
+@@ -77,4 +77,27 @@ typedef signed int ssize_t;
+ # define UINT64_MAX 0xffffffffffffffffULL
+ #endif
+
++#if defined(__sun)
++#include <sys/regset.h>
++#undef CS
++#undef DS
++#undef ES
++#undef FS
++#undef GS
++#undef SS
++#undef EAX
++#undef ECX
++#undef EDX
++#undef EBX
++#undef ESP
++#undef EBP
++#undef ESI
++#undef EDI
++#undef EIP
++#undef UESP
++#undef EFL
++#undef ERR
++#undef TRAPNO
++#endif
++
+ #endif /* LLVM_C_DATATYPES_H */
diff --git a/rust193/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h b/rust193/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
new file mode 100644
index 0000000000..7ddeba50e3
--- /dev/null
+++ b/rust193/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
+
+--- src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h.orig 2025-10-28 16:34:16.000000000 +0000
++++ src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h
+@@ -20,6 +20,11 @@
+ #define LLVM_ANALYSIS_CONSTANTFOLDING_H
+
+ #include "llvm/Support/Compiler.h"
++
++#ifdef __sun
++#undef CS
++#endif
++
+ #include <stdint.h>
+
+ namespace llvm {
diff --git a/rust193/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp b/rust193/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
new file mode 100644
index 0000000000..e255aa5af9
--- /dev/null
+++ b/rust193/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.13 2024/04/18 09:29:42 pin Exp $
+
+Avoid ambiguous function call.
+
+--- src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp.orig 2019-02-12 15:22:48.000000000 +0000
++++ src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp
+@@ -592,7 +592,7 @@ static void DumpAnnotatedInput(raw_ostre
+ unsigned LineCount = InputFileText.count('\n');
+ if (InputFileEnd[-1] != '\n')
+ ++LineCount;
+- unsigned LineNoWidth = std::log10(LineCount) + 1;
++ unsigned LineNoWidth = std::log10((float)LineCount) + 1;
+ // +3 below adds spaces (1) to the left of the (right-aligned) line numbers
+ // on input lines and (2) to the right of the (left-aligned) labels on
+ // annotation lines so that input lines and annotation lines are more
diff --git a/rust193/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs b/rust193/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
new file mode 100644
index 0000000000..0d2e97d952
--- /dev/null
+++ b/rust193/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
+
+Turn off incremental builds for sparc64, ref.
+https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
+
+--- src/tools/cargo/src/cargo/core/profiles.rs.orig 2023-07-12 03:33:05.000000000 +0000
++++ src/tools/cargo/src/cargo/core/profiles.rs
+@@ -681,6 +681,9 @@ impl Profile {
+ debuginfo: DebugInfo::Resolved(TomlDebugInfo::Full),
+ debug_assertions: true,
+ overflow_checks: true,
++ #[cfg(target_arch = "sparc64")]
++ incremental: false,
++ #[cfg(not(target_arch = "sparc64"))]
+ incremental: true,
+ ..Profile::default()
+ }
diff --git a/rust193/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/rust193/patches/patch-src_tools_cargo_tests_testsuite_build.rs
new file mode 100644
index 0000000000..faee0c00f9
--- /dev/null
+++ b/rust193/patches/patch-src_tools_cargo_tests_testsuite_build.rs
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.14 2024/04/18 09:29:42 pin Exp $
+
+Don't attempt incremental operations on sparc64, ref.
+https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
+
+--- src/tools/cargo/tests/testsuite/build.rs.orig 2025-01-27 23:20:59.000000000 +0000
++++ src/tools/cargo/tests/testsuite/build.rs
+@@ -41,6 +41,7 @@ i am foo
+ .run();
+ }
+
++#[cfg(not(target_arch = "sparc64"))]
+ #[cargo_test]
+ fn build_with_symlink_to_path_dependency_with_build_script_in_git() {
+ if !symlink_supported() {
+@@ -103,6 +104,7 @@ fn cargo_fail_with_no_stderr() {
+
+ /// Checks that the `CARGO_INCREMENTAL` environment variable results in
+ /// `rustc` getting `-C incremental` passed to it.
++#[cfg(not(target_arch = "sparc64"))]
+ #[cargo_test]
+ fn cargo_compile_incremental() {
+ let p = project()
+@@ -132,6 +134,7 @@ fn cargo_compile_incremental() {
+ .run();
+ }
+
++#[cfg(not(target_arch = "sparc64"))]
+ #[cargo_test]
+ fn incremental_profile() {
+ let p = project()
+@@ -175,6 +178,7 @@ fn incremental_profile() {
+ .run();
+ }
+
++#[cfg(not(target_arch = "sparc64"))]
+ #[cargo_test]
+ fn incremental_config() {
+ let p = project()
diff --git a/rust193/patches/patch-src_tools_rust-installer_install-template.sh b/rust193/patches/patch-src_tools_rust-installer_install-template.sh
new file mode 100644
index 0000000000..a534c9698e
--- /dev/null
+++ b/rust193/patches/patch-src_tools_rust-installer_install-template.sh
@@ -0,0 +1,72 @@
+$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.14 2024/04/18 09:29:42 pin Exp $
+
+No logging to 'install.log'.
+Do not create 'uninstall.sh'.
+Do not make file backups (filename.old), so these will not end up in the final package.
+
+Rewrite to not use a whole lot of subprocesses just for doing
+pattern matching and substitution in the install phase using "grep"
+and "sed" when shell builtin "case" and "omit shortest match" ops
+should do just fine.
+
+--- src/tools/rust-installer/install-template.sh.orig 2023-12-21 16:55:28.000000000 +0000
++++ src/tools/rust-installer/install-template.sh
+@@ -6,20 +6,12 @@ set -u
+ init_logging() {
+ local _abs_libdir="$1"
+ local _logfile="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/install.log"
+- rm -f "$_logfile"
+- need_ok "failed to remove old installation log"
+- touch "$_logfile"
+- need_ok "failed to create installation log"
+ LOGFILE="$_logfile"
+ }
+
+ log_line() {
+ local _line="$1"
+
+- if [ -n "${LOGFILE-}" -a -e "${LOGFILE-}" ]; then
+- echo "$_line" >> "$LOGFILE"
+- # Ignore errors, which may happen e.g. after the manifest dir is deleted
+- fi
+ }
+
+ msg() {
+@@ -433,8 +425,8 @@ uninstall_components() {
+ local _directive
+ while read _directive; do
+
+- local _command=`echo $_directive | cut -f1 -d:`
+- local _file=`echo $_directive | cut -f2 -d:`
++ local _command=${_directive%%:*}
++ local _file=${_directive#*:}
+
+ # Sanity checks
+ if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
+@@ -541,8 +533,8 @@ install_components() {
+ local _directive
+ while read _directive; do
+
+- local _command=`echo $_directive | cut -f1 -d:`
+- local _file=`echo $_directive | cut -f2 -d:`
++ local _command=${_directive%%:*}
++ local _file=${_directive#*:}
+
+ # Sanity checks
+ if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
+@@ -628,7 +620,6 @@ install_components() {
+
+ verbose_msg "copying directory $_file_install_path"
+
+- maybe_backup_path "$_file_install_path"
+
+ run cp -R "$_src_dir/$_component/$_file" "$_file_install_path"
+ critical_need_ok "failed to copy directory"
+@@ -977,7 +968,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
+ critical_need_ok "failed to write installer version"
+
+ # Install the uninstaller
+-install_uninstaller "$src_dir" "$src_basename" "$abs_libdir"
+
+ # Install each component
+ install_components "$src_dir" "$abs_libdir" "$dest_prefix" "$components"
diff --git a/rust193/patches/patch-tests_assembly-llvm_targets_targets-elf.rs b/rust193/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
new file mode 100644
index 0000000000..b435eaa191
--- /dev/null
+++ b/rust193/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix test suite for mips64el-unknown-netbsd.
+
+--- tests/assembly-llvm/targets/targets-elf.rs.orig 2025-09-19 21:53:43.152938454 +0000
++++ tests/assembly-llvm/targets/targets-elf.rs
+@@ -301,6 +301,9 @@
+ //@ revisions: mips64el_unknown_linux_muslabi64
+ //@ [mips64el_unknown_linux_muslabi64] compile-flags: --target mips64el-unknown-linux-muslabi64
+ //@ [mips64el_unknown_linux_muslabi64] needs-llvm-components: mips
++//@ revisions: mips64el_unknown_netbsd
++//@ [mips64el_unknown_netbsd] compile-flags: --target mips64el_unknown_netbsd-unknown-linux-muslabi64
++//@ [mips64el_unknown_netbsd] needs-llvm-components: mips
+ //@ revisions: mips_unknown_linux_gnu
+ //@ [mips_unknown_linux_gnu] compile-flags: --target mips-unknown-linux-gnu
+ //@ [mips_unknown_linux_gnu] needs-llvm-components: mips
diff --git a/rust193/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs b/rust193/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
new file mode 100644
index 0000000000..8a7b3793fa
--- /dev/null
+++ b/rust193/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add NetBSD/mipsel to non-atomic targets.
+
+--- vendor/crossbeam-utils-0.8.18/no_atomic.rs.orig 2024-05-03 22:53:42.558166596 +0000
++++ vendor/crossbeam-utils-0.8.18/no_atomic.rs
+@@ -5,6 +5,7 @@ const NO_ATOMIC: &[&str] = &[
+ "bpfeb-unknown-none",
+ "bpfel-unknown-none",
+ "mipsel-sony-psx",
++ "mipsel-unknown-netbsd",
+ "msp430-none-elf",
+ "riscv32i-unknown-none-elf",
+ "riscv32im-unknown-none-elf",
diff --git a/rust193/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust193/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..1b6c7088be
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.155/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.155/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3142,6 +3142,7 @@ cfg_if! {
+ if #[cfg(libc_union)] {
+ extern {
+ // these functions use statvfs:
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
+ }
diff --git a/rust193/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs b/rust193/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..ee6548b217
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.155/src/unix/solarish/mod.rs.orig 2024-08-29 18:03:17.866520790 +0000
++++ vendor/libc-0.2.155/src/unix/solarish/mod.rs
+@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+ pub const ENOTRECOVERABLE: ::c_int = 59;
+ pub const ENOSTR: ::c_int = 60;
+ pub const ENODATA: ::c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: ::c_int = 62;
+ pub const ENOSR: ::c_int = 63;
+ pub const ENONET: ::c_int = 64;
diff --git a/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..2127d0f1bc
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.168/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-04-05 11:35:20.818765987 +0000
++++ vendor/libc-0.2.168/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2850,6 +2850,7 @@ extern "C" {
+ hint: *const c_void,
+ ) -> c_int;
+
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut crate::statvfs, flags: c_int) -> c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: size_t, flags: c_int) -> c_int;
+ }
diff --git a/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..003128b639
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,44 @@
+$NetBSD$
+
+Unbreak this module.
+
+I admit to this entirely being based on "cargo cult", but at least
+the rust compiler (cross-)builds for NetBSD/risc64 with this,
+whereas it did not earlier.
+
+--- vendor/libc-0.2.168/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-06-28 07:45:40.263146414 +0000
++++ vendor/libc-0.2.168/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,4 +1,4 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+
+ use crate::prelude::*;
+
+@@ -8,21 +8,18 @@ pub type c_char = u8;
+ 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];
+-
+-s! {
+- pub struct mcontext_t {
+- pub __gregs: __gregset,
+- pub __fregs: __fpregset,
+- __spare: [crate::__greg_t; 7],
+- }
+-}
++pub type __fregset = [__fpreg; _NFREG];
+
+ s_no_extra_traits! {
+ pub union __fpreg {
+ pub u_u64: u64,
+ pub u_d: c_double,
+ }
++ pub struct mcontext_t {
++ pub __gregs: __gregset,
++ pub __fregs: __fregset,
++ __spare: [crate::__greg_t; 7],
++ }
+ }
+
+ pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_long>() - 1;
diff --git a/rust193/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs b/rust193/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..6af8f1a783
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.168/src/unix/solarish/mod.rs.orig 2025-04-05 11:37:41.783212722 +0000
++++ vendor/libc-0.2.168/src/unix/solarish/mod.rs
+@@ -1421,6 +1421,8 @@ pub const EOWNERDEAD: c_int = 58;
+ pub const ENOTRECOVERABLE: c_int = 59;
+ pub const ENOSTR: c_int = 60;
+ pub const ENODATA: c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: c_int = 62;
+ pub const ENOSR: c_int = 63;
+ pub const ENONET: c_int = 64;
diff --git a/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..67b812ae9b
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.169/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.169/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2850,6 +2850,7 @@ extern "C" {
+ hint: *const c_void,
+ ) -> c_int;
+
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut crate::statvfs, flags: c_int) -> c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: size_t, flags: c_int) -> c_int;
+ }
diff --git a/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..a44e84040e
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,90 @@
+$NetBSD$
+
+Unbreak this module.
+
+I admit to this entirely being based on "cargo cult", but at least
+the rust compiler (cross-)builds for NetBSD/risc64 with this,
+whereas it did not earlier.
+
+--- vendor/libc-0.2.169/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-02-24 07:49:42.565876506 +0000
++++ vendor/libc-0.2.169/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,4 +1,4 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+
+ use crate::prelude::*;
+
+@@ -8,20 +8,66 @@ pub type c_char = u8;
+ 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 __fregset = [__fpreg; _NFREG];
+
+-s! {
++s_no_extra_traits! {
++ pub union __fpreg {
++ #[cfg(libc_union)]
++ pub u_u64: u64,
++ pub u_d: c_double,
++ }
+ pub struct mcontext_t {
+ pub __gregs: __gregset,
+- pub __fregs: __fpregset,
++ pub __fregs: __fregset,
+ __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")] {
++// 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
++ }
++ }
++ }
++ #[cfg(libc_union)]
++ impl Eq for __fpreg {}
++ #[cfg(libc_union)]
++ impl ::fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ unsafe {
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_64)
++ .field("u_d", &self.u_d)
++ .finish()
++ }
++ }
++ }
++ #[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
++ }
++ }
+ }
+ }
+
diff --git a/rust193/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs b/rust193/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..a1339953f1
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.169/src/unix/solarish/mod.rs.orig 2024-08-29 18:03:17.866520790 +0000
++++ vendor/libc-0.2.169/src/unix/solarish/mod.rs
+@@ -1421,6 +1421,8 @@ pub const EOWNERDEAD: c_int = 58;
+ pub const ENOTRECOVERABLE: c_int = 59;
+ pub const ENOSTR: c_int = 60;
+ pub const ENODATA: c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: c_int = 62;
+ pub const ENOSR: c_int = 63;
+ pub const ENONET: c_int = 64;
diff --git a/rust193/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..fdf24dce61
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,90 @@
+$NetBSD$
+
+Unbreak this module.
+
+I admit to this entirely being based on "cargo cult", but at least
+the rust compiler (cross-)builds for NetBSD/risc64 with this,
+whereas it did not earlier.
+
+--- vendor/libc-0.2.171/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-05-19 22:03:59.982023413 +0000
++++ vendor/libc-0.2.171/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,24 +1,70 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+
+ use crate::prelude::*;
+
+ 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 __fregset = [__fpreg; _NFREG];
+
+-s! {
++s_no_extra_traits! {
++ pub union __fpreg {
++ #[cfg(libc_union)]
++ pub u_u64: u64,
++ pub u_d: c_double,
++ }
+ pub struct mcontext_t {
+ pub __gregs: __gregset,
+- pub __fregs: __fpregset,
+- __spare: [crate::__greg_t; 7],
++ pub __fregs: __fregset,
++ __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")] {
++// 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
++ }
++ }
++ }
++ #[cfg(libc_union)]
++ impl Eq for __fpreg {}
++ #[cfg(libc_union)]
++ impl ::fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ unsafe {
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_64)
++ .field("u_d", &self.u_d)
++ .finish()
++ }
++ }
++ }
++ #[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
++ }
++ }
+ }
+ }
+
diff --git a/rust193/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..44401fa70e
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,89 @@
+$NetBSD$
+
+Unbreak this module.
+
+I admit to this entirely being based on "cargo cult", but at least
+the rust compiler (cross-)builds for NetBSD/risc64 with this,
+whereas it did not earlier.
+
+--- vendor/libc-0.2.172/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-06-28 07:50:50.001313003 +0000
++++ vendor/libc-0.2.172/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,24 +1,70 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+
+ use crate::prelude::*;
+
+ 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 __fregset = [__fpreg; _NFREG];
+
+-s! {
++s_no_extra_traits! {
++ pub union __fpreg {
++ #[cfg(libc_union)]
++ pub u_u64: u64,
++ pub u_d: c_double,
++ }
+ pub struct mcontext_t {
+ pub __gregs: __gregset,
+- pub __fregs: __fpregset,
++ pub __fregs: __fregset,
+ __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")] {
++// 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
++ }
++ }
++ }
++ #[cfg(libc_union)]
++ impl Eq for __fpreg {}
++ #[cfg(libc_union)]
++ impl ::fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ unsafe {
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_64)
++ .field("u_d", &self.u_d)
++ .finish()
++ }
++ }
++ }
++ #[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
++ }
++ }
+ }
+ }
+
diff --git a/rust193/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs b/rust193/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..224b4e930b
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.172/src/unix/solarish/mod.rs.orig 2025-06-28 07:52:15.632394747 +0000
++++ vendor/libc-0.2.172/src/unix/solarish/mod.rs
+@@ -1421,6 +1421,8 @@ pub const EBFONT: c_int = 57;
+ pub const EOWNERDEAD: c_int = 58;
+ pub const ENOTRECOVERABLE: c_int = 59;
+ pub const ENOSTR: c_int = 60;
++// This is not supported but is required for xattr
++pub const ENOATTR: c_int = ENODATA;
+ pub const ENODATA: c_int = 61;
+ pub const ETIME: c_int = 62;
+ pub const ENOSR: c_int = 63;
diff --git a/rust193/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..bb3c8b5c52
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,89 @@
+$NetBSD$
+
+Unbreak this module.
+
+I admit to this entirely being based on "cargo cult", but at least
+the rust compiler (cross-)builds for NetBSD/risc64 with this,
+whereas it did not earlier.
+
+--- vendor/libc-0.2.174/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-05-19 23:28:32.395024196 +0000
++++ vendor/libc-0.2.174/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,24 +1,70 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+
+ use crate::prelude::*;
+
+ 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 __fregset = [__fpreg; _NFREG];
+
+-s! {
++s_no_extra_traits! {
++ pub union __fpreg {
++ #[cfg(libc_union)]
++ pub u_u64: u64,
++ pub u_d: c_double,
++ }
+ pub struct mcontext_t {
+ pub __gregs: __gregset,
+- pub __fregs: __fpregset,
++ pub __fregs: __fregset,
+ __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")] {
++// 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
++ }
++ }
++ }
++ #[cfg(libc_union)]
++ impl Eq for __fpreg {}
++ #[cfg(libc_union)]
++ impl ::fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ unsafe {
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_64)
++ .field("u_d", &self.u_d)
++ .finish()
++ }
++ }
++ }
++ #[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
++ }
++ }
+ }
+ }
+
diff --git a/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..4b32e88f6d
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+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
diff --git a/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..a0eb64778f
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,71 @@
+$NetBSD$
+
+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.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,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;
diff --git a/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..bfe53e213c
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+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.177/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-12-28 21:32:55.585212755 +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
diff --git a/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..05c0d14ca1
--- /dev/null
+++ b/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,71 @@
+$NetBSD$
+
+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;
diff --git a/rust193/patches/patch-vendor_line-index-0.1.2_src_lib.rs b/rust193/patches/patch-vendor_line-index-0.1.2_src_lib.rs
new file mode 100644
index 0000000000..4d14411866
--- /dev/null
+++ b/rust193/patches/patch-vendor_line-index-0.1.2_src_lib.rs
@@ -0,0 +1,42 @@
+$NetBSD$
+
+Do not attempt use of neon extension in big-endian mode.
+
+--- vendor/line-index-0.1.2/src/lib.rs.orig 2025-02-03 07:59:39.771200202 +0000
++++ vendor/line-index-0.1.2/src/lib.rs
+@@ -235,7 +235,7 @@ fn analyze_source_file_dispatch(
+ }
+ }
+
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ fn analyze_source_file_dispatch(
+ src: &str,
+ lines: &mut Vec<TextSize>,
+@@ -347,7 +347,7 @@ unsafe fn analyze_source_file_sse2(
+ }
+
+ #[target_feature(enable = "neon")]
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ #[inline]
+ // See https://community.arm.com/arm-community-blogs/b/infrastructure-solutions-blog/posts/porting-x86-vector-bitmask-optimizations-to-arm-neon
+ //
+@@ -362,7 +362,7 @@ unsafe fn move_mask(v: std::arch::aarch6
+ }
+
+ #[target_feature(enable = "neon")]
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ unsafe fn analyze_source_file_neon(
+ src: &str,
+ lines: &mut Vec<TextSize>,
+@@ -441,7 +441,7 @@ unsafe fn analyze_source_file_neon(
+ }
+ }
+
+-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))]
++#[cfg(not(any(target_arch = "x86", target_arch = "x86_64", all(target_arch = "aarch64", target_endian = "little"))))]
+ // The target (or compiler version) does not support SSE2 ...
+ fn analyze_source_file_dispatch(
+ src: &str,
diff --git a/rust193/patches/patch-vendor_lzma-sys-0.1.20_config.h b/rust193/patches/patch-vendor_lzma-sys-0.1.20_config.h
new file mode 100644
index 0000000000..6eaa429abe
--- /dev/null
+++ b/rust193/patches/patch-vendor_lzma-sys-0.1.20_config.h
@@ -0,0 +1,25 @@
+$NetBSD$
+
+clock_gettime() is available also on NetBSD.
+
+This takes care of this build error:
+
+ cargo:warning=xz-5.2/src/common/mythread.h: In function 'mythread_condtime_set':
+ cargo:warning=xz-5.2/src/common/mythread.h:312:9: error: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
+ cargo:warning= 312 | gettimeofday(&now, NULL);
+ cargo:warning= | ^~~~~~~~~~~~
+
+which popped up when switching powerpc to using gcc14, but strangely
+was not triggered by gcc12 or in-tree gcc.
+
+--- vendor/lzma-sys-0.1.20/config.h.orig 2025-02-11 23:15:56.129312069 +0000
++++ vendor/lzma-sys-0.1.20/config.h
+@@ -39,7 +39,7 @@
+ #define MYTHREAD_POSIX 1
+ #endif
+
+-#if defined(__sun)
++#if defined(__sun) || defined(__NetBSD__)
+ #define HAVE_CLOCK_GETTIME 1
+ #define HAVE_DECL_CLOCK_MONOTONIC 1
+ #endif
diff --git a/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs b/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
new file mode 100644
index 0000000000..06fbbc1f87
--- /dev/null
+++ b/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Don't try to do neon / SIMD on big-endian aarch64.
+
+--- vendor/memchr-2.7.4/src/arch/aarch64/memchr.rs.orig 2024-09-22 14:55:32.455792108 +0000
++++ vendor/memchr-2.7.4/src/arch/aarch64/memchr.rs
+@@ -8,7 +8,7 @@ available for `aarch64` targets.)
+
+ macro_rules! defraw {
+ ($ty:ident, $find:ident, $start:ident, $end:ident, $($needles:ident),+) => {{
+- #[cfg(target_feature = "neon")]
++ #[cfg(all(target_feature = "neon", target_endian = "little"))]
+ {
+ use crate::arch::aarch64::neon::memchr::$ty;
+
+@@ -19,7 +19,7 @@ macro_rules! defraw {
+ // enabled.
+ $ty::new_unchecked($($needles),+).$find($start, $end)
+ }
+- #[cfg(not(target_feature = "neon"))]
++ #[cfg(not(all(target_feature = "neon", target_endian = "little")))]
+ {
+ use crate::arch::all::memchr::$ty;
+
diff --git a/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs b/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
new file mode 100644
index 0000000000..3fa3ec8c4d
--- /dev/null
+++ b/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't try to do neon / SIMD on big-endian aarch64.
+
+--- vendor/memchr-2.7.4/src/arch/aarch64/mod.rs.orig 2024-09-22 19:17:13.167426584 +0000
++++ vendor/memchr-2.7.4/src/arch/aarch64/mod.rs
+@@ -2,6 +2,8 @@
+ Vector algorithms for the `aarch64` target.
+ */
+
++#[cfg(target_endian = "little")]
+ pub mod neon;
+
++#[cfg(target_endian = "little")]
+ pub(crate) mod memchr;
diff --git a/rust193/patches/patch-vendor_memchr-2.7.4_src_memchr.rs b/rust193/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
new file mode 100644
index 0000000000..da85596fc1
--- /dev/null
+++ b/rust193/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
@@ -0,0 +1,128 @@
+$NetBSD$
+
+Don't try to do neon / SIMD on big-endian aarch64.
+
+--- vendor/memchr-2.7.4/src/memchr.rs.orig 2024-09-22 14:50:24.931022916 +0000
++++ vendor/memchr-2.7.4/src/memchr.rs
+@@ -518,14 +518,14 @@ unsafe fn memchr_raw(
+ {
+ crate::arch::wasm32::memchr::memchr_raw(needle, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memchr_raw(needle, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::One::new(needle).find_raw(start, end)
+@@ -551,14 +551,14 @@ unsafe fn memrchr_raw(
+ {
+ crate::arch::wasm32::memchr::memrchr_raw(needle, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memrchr_raw(needle, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::One::new(needle).rfind_raw(start, end)
+@@ -585,14 +585,14 @@ unsafe fn memchr2_raw(
+ {
+ crate::arch::wasm32::memchr::memchr2_raw(needle1, needle2, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memchr2_raw(needle1, needle2, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Two::new(needle1, needle2)
+@@ -620,7 +620,7 @@ unsafe fn memrchr2_raw(
+ {
+ crate::arch::wasm32::memchr::memrchr2_raw(needle1, needle2, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memrchr2_raw(
+ needle1, needle2, start, end,
+@@ -629,7 +629,7 @@ unsafe fn memrchr2_raw(
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Two::new(needle1, needle2)
+@@ -662,7 +662,7 @@ unsafe fn memchr3_raw(
+ needle1, needle2, needle3, start, end,
+ )
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memchr3_raw(
+ needle1, needle2, needle3, start, end,
+@@ -671,7 +671,7 @@ unsafe fn memchr3_raw(
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Three::new(needle1, needle2, needle3)
+@@ -704,7 +704,7 @@ unsafe fn memrchr3_raw(
+ needle1, needle2, needle3, start, end,
+ )
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memrchr3_raw(
+ needle1, needle2, needle3, start, end,
+@@ -713,7 +713,7 @@ unsafe fn memrchr3_raw(
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Three::new(needle1, needle2, needle3)
+@@ -736,14 +736,14 @@ unsafe fn count_raw(needle: u8, start: *
+ {
+ crate::arch::wasm32::memchr::count_raw(needle, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::count_raw(needle, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::One::new(needle).count_raw(start, end)
diff --git a/rust193/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs b/rust193/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
new file mode 100644
index 0000000000..743d4886ee
--- /dev/null
+++ b/rust193/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
@@ -0,0 +1,78 @@
+$NetBSD$
+
+Don't try to use neon / SIMD on big-endian aarch64.
+
+--- vendor/memchr-2.7.4/src/memmem/searcher.rs.orig 2024-09-22 14:44:21.224731060 +0000
++++ vendor/memchr-2.7.4/src/memmem/searcher.rs
+@@ -3,7 +3,7 @@ use crate::arch::all::{
+ rabinkarp, twoway,
+ };
+
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ use crate::arch::aarch64::neon::packedpair as neon;
+ #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
+ use crate::arch::wasm32::simd128::packedpair as simd128;
+@@ -129,7 +129,7 @@ impl Searcher {
+ Searcher::twoway(needle, rabinkarp, prestrat)
+ }
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ if let Some(pp) = neon::Finder::with_pair(needle, pair) {
+ if do_packed_search(needle) {
+@@ -152,7 +152,7 @@ impl Searcher {
+ #[cfg(not(any(
+ all(target_arch = "x86_64", target_feature = "sse2"),
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ if prefilter.is_none() {
+@@ -253,7 +253,7 @@ union SearcherKind {
+ avx2: crate::arch::x86_64::avx2::packedpair::Finder,
+ #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
+ simd128: crate::arch::wasm32::simd128::packedpair::Finder,
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ neon: crate::arch::aarch64::neon::packedpair::Finder,
+ }
+
+@@ -421,7 +421,7 @@ unsafe fn searcher_kind_simd128(
+ /// # Safety
+ ///
+ /// Callers must ensure that the `searcher.kind.neon` union field is set.
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ unsafe fn searcher_kind_neon(
+ searcher: &Searcher,
+ _prestate: &mut PrefilterState,
+@@ -686,7 +686,7 @@ impl Prefilter {
+ }
+
+ /// Return a prefilter using a aarch64 neon vector algorithm.
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ #[inline]
+ fn neon(finder: neon::Finder, needle: &[u8]) -> Prefilter {
+ trace!("building aarch64 neon prefilter");
+@@ -763,7 +763,7 @@ union PrefilterKind {
+ avx2: crate::arch::x86_64::avx2::packedpair::Finder,
+ #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
+ simd128: crate::arch::wasm32::simd128::packedpair::Finder,
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ neon: crate::arch::aarch64::neon::packedpair::Finder,
+ }
+
+@@ -852,7 +852,7 @@ unsafe fn prefilter_kind_simd128(
+ /// # Safety
+ ///
+ /// Callers must ensure that the `strat.kind.neon` union field is set.
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ unsafe fn prefilter_kind_neon(
+ strat: &Prefilter,
+ haystack: &[u8],
diff --git a/rust193/patches/patch-vendor_memchr-2.7.4_src_vector.rs b/rust193/patches/patch-vendor_memchr-2.7.4_src_vector.rs
new file mode 100644
index 0000000000..6851a4a4fd
--- /dev/null
+++ b/rust193/patches/patch-vendor_memchr-2.7.4_src_vector.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't try to do neon / SIMD on big-endian aarch64.
+
+--- vendor/memchr-2.7.4/src/vector.rs.orig 2024-09-22 14:16:06.473207292 +0000
++++ vendor/memchr-2.7.4/src/vector.rs
+@@ -289,7 +289,7 @@ mod x86avx2 {
+ }
+ }
+
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ mod aarch64neon {
+ use core::arch::aarch64::*;
+
diff --git a/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf b/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
new file mode 100644
index 0000000000..8a3b7874ae
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Replicate part of
+https://github.com/openssl/openssl/pull/15086
+
+--- vendor/openssl-src-111.28.2+1.1.1w/openssl/Configurations/10-main.conf.orig 2025-05-18 13:23:47.013841572 +0000
++++ vendor/openssl-src-111.28.2+1.1.1w/openssl/Configurations/10-main.conf
+@@ -943,6 +943,10 @@ my %targets = (
+ shared_cflag => "-fPIC",
+ shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
+ },
++ "NetBSD-generic32" => {
++ inherit_from => [ "BSD-generic32" ],
++ ex_libs => add(threads("-latomic")),
++ },
+ "BSD-generic64" => {
+ inherit_from => [ "BSD-generic32" ],
+ bn_ops => "SIXTY_FOUR_BIT_LONG",
diff --git a/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c b/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
new file mode 100644
index 0000000000..be229e5788
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Make this build if bswap32 is already defined, as for NetBSD/i586.
+
+--- vendor/openssl-src-111.28.2+1.1.1w/openssl/crypto/aria/aria.c.orig 2025-05-19 20:01:02.477323075 +0000
++++ vendor/openssl-src-111.28.2+1.1.1w/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) ( \
diff --git a/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs b/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
new file mode 100644
index 0000000000..bff359039c
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
@@ -0,0 +1,64 @@
+$NetBSD$
+
+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
+@@ -239,6 +239,8 @@ impl Build {
+ "aarch64-unknown-freebsd" => "BSD-generic64",
+ "aarch64-unknown-linux-gnu" => "linux-aarch64",
+ "aarch64-unknown-linux-musl" => "linux-aarch64",
++ "aarch64-unknown-netbsd" => "BSD-generic64",
++ "aarch64_be-unknown-netbsd" => "BSD-generic64",
+ "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
+ "arm-linux-androideabi" => "linux-armv4",
+ "armv7-linux-androideabi" => "linux-armv4",
+@@ -249,14 +251,17 @@ 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",
+ "armv7-unknown-freebsd" => "BSD-generic32",
+ "armv7-unknown-linux-gnueabi" => "linux-armv4",
+ "armv7-unknown-linux-musleabi" => "linux-armv4",
+ "armv7-unknown-linux-gnueabihf" => "linux-armv4",
+ "armv7-unknown-linux-musleabihf" => "linux-armv4",
++ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
+ "asmjs-unknown-emscripten" => "gcc",
+ "i586-unknown-linux-gnu" => "linux-elf",
+ "i586-unknown-linux-musl" => "linux-elf",
++ "i586-unknown-netbsd" => "BSD-x86-elf",
+ "i686-apple-darwin" => "darwin-i386-cc",
+ "i686-linux-android" => "linux-elf",
+ "i686-pc-windows-gnu" => "mingw",
+@@ -264,6 +269,7 @@ 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",
+ "mips-unknown-linux-gnu" => "linux-mips32",
+@@ -274,9 +280,11 @@ 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-generic32",
+ "powerpc-unknown-linux-gnu" => "linux-ppc",
+ "powerpc-unknown-linux-gnuspe" => "linux-ppc",
++ "powerpc-unknown-netbsd" => "NetBSD-generic32",
+ "powerpc64-unknown-freebsd" => "BSD-generic64",
+ "powerpc64-unknown-linux-gnu" => "linux-ppc64",
+ "powerpc64-unknown-linux-musl" => "linux-ppc64",
+@@ -284,8 +292,10 @@ impl Build {
+ "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+ "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
+ "riscv64gc-unknown-linux-gnu" => "linux-generic64",
++ "riscv64gc-unknown-netbsd" => "BSD-generic64",
+ "s390x-unknown-linux-gnu" => "linux64-s390x",
+ "s390x-unknown-linux-musl" => "linux64-s390x",
++ "sparc64-unknown-netbsd" => "BSD-generic64",
+ "x86_64-apple-darwin" => "darwin64-x86_64-cc",
+ "x86_64-linux-android" => "linux-x86_64",
+ "x86_64-pc-windows-gnu" => "mingw64",
diff --git a/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf b/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
new file mode 100644
index 0000000000..788a38e3d8
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Replicate part of
+https://github.com/openssl/openssl/pull/15086
+
+--- vendor/openssl-src-300.5.0+3.5.0/openssl/Configurations/10-main.conf.orig 2025-05-20 09:03:49.120083364 +0000
++++ vendor/openssl-src-300.5.0+3.5.0/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",
diff --git a/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c b/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
new file mode 100644
index 0000000000..34a78253e2
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Make this build also if bswap32 is already defined, as for NetBSD/i586.
+
+--- vendor/openssl-src-300.5.0+3.5.0/openssl/crypto/aria/aria.c.orig 2025-05-19 20:04:00.808387729 +0000
++++ vendor/openssl-src-300.5.0+3.5.0/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) ( \
diff --git a/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs b/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
new file mode 100644
index 0000000000..9fc8090a85
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Make this build on NetBSD for arm64 and mipsel 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
+@@ -321,6 +321,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",
+@@ -356,6 +357,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",
diff --git a/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf b/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
new file mode 100644
index 0000000000..c826efe847
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
@@ -0,0 +1,18 @@
+$NetBSD$
+
+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",
diff --git a/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c b/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
new file mode 100644
index 0000000000..5f134efcf4
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+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) ( \
diff --git a/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs b/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
new file mode 100644
index 0000000000..e185bb51a9
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Make this build on NetBSD for armv6 and mipsel as well.
+
+--- vendor/openssl-src-300.5.4+3.5.4/src/lib.rs.orig 2025-11-02 17:17:16.773220231 +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",
+@@ -361,6 +362,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",
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
new file mode 100644
index 0000000000..3f499547d4
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Add hack for Darwin when homebrew is installed.
+
+--- vendor/openssl-sys-0.9.107/build/find_normal.rs.orig 2025-06-28 08:24:16.945712755 +0000
++++ vendor/openssl-sys-0.9.107/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();
+
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
new file mode 100644
index 0000000000..7e665d8853
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
@@ -0,0 +1,23 @@
+$NetBSD$
+
+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.107/build/main.rs.orig 2025-06-28 08:26:57.774420907 +0000
++++ vendor/openssl-sys-0.9.107/build/main.rs
+@@ -269,6 +269,14 @@ fn main() {
+ println!("cargo:rustc-link-lib=atomic");
+ }
+
++ // Patterned of the above, make sure we include -latomic
++ // on ilp32 NetBSD 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");
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
new file mode 100644
index 0000000000..31a115a1cc
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Add hack for Darwin when homebrew is installed.
+
+--- vendor/openssl-sys-0.9.109/build/find_normal.rs.orig 2025-06-28 08:28:59.789478187 +0000
++++ vendor/openssl-sys-0.9.109/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();
+
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
new file mode 100644
index 0000000000..4a6098ad57
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
@@ -0,0 +1,23 @@
+$NetBSD$
+
+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.109/build/main.rs.orig 2025-06-28 08:30:05.194163693 +0000
++++ vendor/openssl-sys-0.9.109/build/main.rs
+@@ -269,6 +269,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");
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
new file mode 100644
index 0000000000..fd7def4861
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Add hack for Darwin when homebrew is installed.
+
+--- vendor/openssl-sys-0.9.92/build/find_normal.rs.orig 2025-09-19 21:56:18.930723780 +0000
++++ vendor/openssl-sys-0.9.92/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();
+
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
new file mode 100644
index 0000000000..b7131a38fe
--- /dev/null
+++ b/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
@@ -0,0 +1,23 @@
+$NetBSD$
+
+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.92/build/main.rs.orig 2025-09-19 21:57:47.732695298 +0000
++++ vendor/openssl-sys-0.9.92/build/main.rs
+@@ -115,6 +115,14 @@ fn main() {
+ println!("cargo:rustc-link-lib={}={}", kind, lib);
+ }
+
++ // Patterned of the above, make sure we include -latomic
++ // on NetBSD 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");
diff --git a/rust193/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/rust193/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
new file mode 100644
index 0000000000..6c90dec84c
--- /dev/null
+++ b/rust193/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
@@ -0,0 +1,27 @@
+$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.9 2024/04/18 09:29:43 pin Exp $
+
+Add aarch64_be NetBSD target.
+
+--- /dev/null 2021-04-26 00:02:43.147970692 +0200
++++ vendor/rustc-ap-rustc_target/src/spec/aarch64_be_unknown_netbsd.rs 2021-04-26 00:07:44.657579025 +0200
+@@ -0,0 +1,20 @@
++use crate::abi::Endian;
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = super::netbsd_base::opts();
++ base.max_atomic_width = Some(128);
++ base.unsupported_abis = super::arm_base::unsupported_abis();
++
++ Target {
++ llvm_target: "aarch64_be-unknown-netbsd".to_string(),
++ pointer_width: 64,
++ data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
++ arch: "aarch64".to_string(),
++ options: TargetOptions {
++ mcount: "__mcount".to_string(),
++ endian: Endian::Big,
++ ..base
++ },
++ }
++}
diff --git a/rust193/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs b/rust193/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
new file mode 100644
index 0000000000..35ab52f6cb
--- /dev/null
+++ b/rust193/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Attempt at skipping SIMD / neon on big-endian aarch64,
+ref. https://github.com/rust-lang/rust/issues/129819.
+
+--- vendor/zerocopy-0.7.32/src/lib.rs.orig 2024-09-01 12:56:49.837065351 +0000
++++ vendor/zerocopy-0.7.32/src/lib.rs
+@@ -3715,7 +3715,7 @@ mod simd {
+ powerpc64, powerpc64, vector_bool_long, vector_double, vector_signed_long, vector_unsigned_long
+ );
+ simd_arch_mod!(
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ aarch64, aarch64, float32x2_t, float32x4_t, float64x1_t, float64x2_t, int8x8_t, int8x8x2_t,
+ int8x8x3_t, int8x8x4_t, int8x16_t, int8x16x2_t, int8x16x3_t, int8x16x4_t, int16x4_t,
+ int16x8_t, int32x2_t, int32x4_t, int64x1_t, int64x2_t, poly8x8_t, poly8x8x2_t, poly8x8x3_t,
+@@ -7998,7 +7998,7 @@ mod tests {
+ vector_signed_long,
+ vector_unsigned_long
+ );
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ #[rustfmt::skip]
+ test_simd_arch_mod!(
+ aarch64, float32x2_t, float32x4_t, float64x1_t, float64x2_t, int8x8_t, int8x8x2_t,
diff --git a/rust193/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs b/rust193/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
new file mode 100644
index 0000000000..d71d7d0924
--- /dev/null
+++ b/rust193/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Attempt at skipping SIMD / neon on big-endian aarch64,
+ref. https://github.com/rust-lang/rust/issues/129819.
+
+--- vendor/zerocopy-0.7.35/src/lib.rs.orig 2024-08-31 21:15:29.602997509 +0000
++++ vendor/zerocopy-0.7.35/src/lib.rs
+@@ -3727,7 +3727,7 @@ mod simd {
+ powerpc64, powerpc64, vector_bool_long, vector_double, vector_signed_long, vector_unsigned_long
+ );
+ simd_arch_mod!(
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ aarch64, aarch64, float32x2_t, float32x4_t, float64x1_t, float64x2_t, int8x8_t, int8x8x2_t,
+ int8x8x3_t, int8x8x4_t, int8x16_t, int8x16x2_t, int8x16x3_t, int8x16x4_t, int16x4_t,
+ int16x8_t, int32x2_t, int32x4_t, int64x1_t, int64x2_t, poly8x8_t, poly8x8x2_t, poly8x8x3_t,
+@@ -8020,7 +8020,7 @@ mod tests {
+ vector_signed_long,
+ vector_unsigned_long
+ );
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ #[rustfmt::skip]
+ test_simd_arch_mod!(
+ aarch64, float32x2_t, float32x4_t, float64x1_t, float64x2_t, int8x8_t, int8x8x2_t,
diff --git a/rust193/patches/patch-vendor_zeroize-1.8.1_src_lib.rs b/rust193/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
new file mode 100644
index 0000000000..990d660c45
--- /dev/null
+++ b/rust193/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't try to use the NEON-specific module in big-endian mode.
+
+--- vendor/zeroize-1.8.1/src/lib.rs.orig 2025-04-06 07:17:23.864281079 +0000
++++ vendor/zeroize-1.8.1/src/lib.rs
+@@ -245,7 +245,7 @@ extern crate std;
+ #[cfg(feature = "zeroize_derive")]
+ pub use zeroize_derive::{Zeroize, ZeroizeOnDrop};
+
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ mod aarch64;
+ #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+ mod x86;
diff --git a/rust193/platform.mk b/rust193/platform.mk
new file mode 100644
index 0000000000..ef0d07388c
--- /dev/null
+++ b/rust193/platform.mk
@@ -0,0 +1,34 @@
+# $NetBSD: platform.mk,v 1.34 2025/10/02 16:59:50 nia Exp $
+
+# This file encodes whether a given platform has support for rust.
+
+# Platforms where rust ought to work but does not require a link to an
+# open PR.
+
+.if !defined(PLATFORM_SUPPORTS_RUST)
+
+# Rust needs NetBSD>8
+.for rust_arch in aarch64 earmv6hf earmv7hf i386 powerpc riscv64 sparc64 x86_64
+. for rust_os in Darwin FreeBSD Linux NetBSD SunOS
+. if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[0-8].*)
+RUST_PLATFORMS+= ${rust_os}-*-${rust_arch}
+. endif
+. endfor
+.endfor
+
+# rust does not build in the VA space available on earm.
+# \todo Consider extension to other platforms.
+.if ${NATIVE_MACHINE_PLATFORM:M*-*-earm*}
+RUST_TYPE?= bin
+.endif
+
+RUST_DIR?= ../../lang/rust
+
+.for rust_platform in ${RUST_PLATFORMS}
+. if !empty(MACHINE_PLATFORM:M${rust_platform})
+PLATFORM_SUPPORTS_RUST?= yes
+. endif
+.endfor
+PLATFORM_SUPPORTS_RUST?= no
+
+.endif # !defined(PLATFORM_SUPPORTS_RUST)
diff --git a/rust193/rust.mk b/rust193/rust.mk
new file mode 100644
index 0000000000..dc01362fd5
--- /dev/null
+++ b/rust193/rust.mk
@@ -0,0 +1,60 @@
+# $NetBSD: rust.mk,v 1.9 2024/07/07 11:00:37 wiz Exp $
+#
+# This file determines the type of rust package to use.
+#
+# It should be included by rust-dependent packages that don't use
+# cargo.mk.
+#
+# === User-settable variables ===
+#
+# RUST_TYPE
+# The preferred type of Rust release to use -
+# either bootstrap-from-source or an official binary.
+#
+# Official Rust binaries are only published for certain platforms,
+# including Darwin, FreeBSD, Linux, and NetBSD x86_64.
+#
+# Possible values: src bin native
+# Default: "src", except on 32-bit arm where it's "bin"
+#
+# === Package-settable variables ===
+#
+# RUST_REQ
+# The minimum version of Rust required by the package.
+#
+# Default: 1.56.1
+#
+# RUST_RUNTIME
+# Whether rust is a runtime dependency.
+# Usually it is only needed to build.
+#
+# Possible values: yes no
+# Default: no
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "platform.mk"
+
+RUST_REQ?= 1.56.1
+RUST_RUNTIME?= no
+
+.if ${MACHINE_PLATFORM:M*-*-earm*}
+RUST_TYPE?= bin
+.else
+RUST_TYPE?= src
+.endif
+
+.if ${RUST_TYPE} == "bin"
+. if ${RUST_RUNTIME} == "no"
+BUILDLINK_DEPMETHOD.rust-bin?= build
+. endif
+BUILDLINK_API_DEPENDS.rust-bin+= rust-bin>=${RUST_REQ}
+. include "${RUST_DIR}-bin/buildlink3.mk"
+.endif
+
+.if ${RUST_TYPE} == "src"
+. if ${RUST_RUNTIME} == "no"
+BUILDLINK_DEPMETHOD.rust?= build
+. endif
+BUILDLINK_API_DEPENDS.rust+= rust>=${RUST_REQ}
+. include "${RUST_DIR}/buildlink3.mk"
+.endif
Home |
Main Index |
Thread Index |
Old Index