pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust193*: remove old rust version
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Thu May 7 15:40:17 2026 +0200
Changeset: ebfcddf8e4eecc661d70d28547f11192f477d216
Modified Files:
Makefile
Removed Files:
rust193-bin/DESCR
rust193-bin/Makefile
rust193-bin/buildlink3.mk
rust193-bin/distinfo
rust193-bin/files/install.sh
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_m68k__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_core_sanity.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_m68k.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.111_build_find__normal.rs
rust193/patches/patch-vendor_openssl-sys-0.9.111_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*: remove old rust version
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ebfcddf8e4eecc661d70d28547f11192f477d216
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 -
rust193-bin/DESCR | 17 -
rust193-bin/Makefile | 308 -------
rust193-bin/buildlink3.mk | 13 -
rust193-bin/distinfo | 56 --
rust193-bin/files/install.sh | 971 ---------------------
rust193/DESCR | 13 -
rust193/HOWTO-BOOTSTRAP | 85 --
rust193/Makefile | 800 -----------------
rust193/buildlink3.mk | 28 -
rust193/cargo.mk | 121 ---
rust193/cross.mk | 86 --
rust193/distinfo | 177 ----
rust193/do-cross.mk | 111 ---
rust193/files/gcc-wrap | 215 -----
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 | 22 -
...rc_spec_targets_aarch64__be__unknown__netbsd.rs | 17 -
...et_src_spec_targets_aarch64__unknown__netbsd.rs | 17 -
...arget_src_spec_targets_m68k__unknown__netbsd.rs | 38 -
...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 -
.../patches/patch-src_bootstrap_src_core_sanity.rs | 15 -
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 --
...-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs | 17 -
...c-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs | 28 -
...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 | 67 --
...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 | 30 -
...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 | 30 -
...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 -
...endor_openssl-sys-0.9.111_build_find__normal.rs | 30 -
.../patch-vendor_openssl-sys-0.9.111_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 --
91 files changed, 5620 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 8cecc2a48a..a64df795e1 100644
--- a/Makefile
+++ b/Makefile
@@ -5311,8 +5311,6 @@ SUBDIR+= runas
SUBDIR+= runcpm
SUBDIR+= rust-beta
SUBDIR+= rust-synapse-compress-state
-SUBDIR+= rust193
-SUBDIR+= rust193-bin
SUBDIR+= rust195
SUBDIR+= rust195-bin
SUBDIR+= s-nail
diff --git a/rust193-bin/DESCR b/rust193-bin/DESCR
deleted file mode 100644
index 5c709044ce..0000000000
--- a/rust193-bin/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-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.
-
-This package installs a released binary, on architectures supported by
-upstream, or a TNF-built binary, on NetBSD versions not supported by
-upstream.
diff --git a/rust193-bin/Makefile b/rust193-bin/Makefile
deleted file mode 100644
index c917669231..0000000000
--- a/rust193-bin/Makefile
+++ /dev/null
@@ -1,308 +0,0 @@
-# $NetBSD: Makefile,v 1.75 2025/04/08 09:33:47 wiz Exp $
-
-DISTNAME= rust-1.93.1
-PKGNAME= ${DISTNAME:S/rust/rust-bin/1}
-CATEGORIES= lang
-MASTER_SITES= https://static.rust-lang.org/dist/
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://rust-lang.org/
-COMMENT= Safe, concurrent, practical language (pre-built distribution)
-LICENSE= mit OR apache-2.0
-
-CONFLICTS+= rust-[0-9]*
-
-# Rust upstream provided binaries
-ONLY_FOR_PLATFORM+= Darwin-*-aarch64
-ONLY_FOR_PLATFORM+= Darwin-*-x86_64
-ONLY_FOR_PLATFORM+= FreeBSD-*-x86_64
-ONLY_FOR_PLATFORM+= Linux-*-aarch64
-ONLY_FOR_PLATFORM+= Linux-*-i386
-ONLY_FOR_PLATFORM+= Linux-*-x86_64
-ONLY_FOR_PLATFORM+= NetBSD-*-x86_64
-
-# he%NetBSD.org@localhost provided binaries
-ONLY_FOR_PLATFORM+= NetBSD-*-aarch64
-ONLY_FOR_PLATFORM+= NetBSD-*-aarch64eb
-ONLY_FOR_PLATFORM+= NetBSD-*-earmv7hf
-ONLY_FOR_PLATFORM+= NetBSD-*-earmv6hf
-ONLY_FOR_PLATFORM+= NetBSD-*-i386
-ONLY_FOR_PLATFORM+= NetBSD-*-powerpc
-ONLY_FOR_PLATFORM+= NetBSD-*-sparc64
-ONLY_FOR_PLATFORM+= NetBSD-*-mipsel
-ONLY_FOR_PLATFORM+= NetBSD-*-riscv64
-
-# Illumos, jperkin@ provided binaries
-ONLY_FOR_PLATFORM+= SunOS-*-x86_64
-
-NETBSD_REPO= https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
-
-CHECK_RELRO_SKIP+= lib/rustlib/*/bin/*
-
-CHECK_SHLIBS_SKIP+= bin/cargo-clippy
-CHECK_SHLIBS_SKIP+= bin/rustfmt
-
-# Bootstraps built for 9.0 or newer, -8 gcc is too old...
-BROKEN_ON_PLATFORM+= NetBSD-8.*
-
-# Binary distributions aren't built as PIE.
-MKPIE_SUPPORTED= no
-
-NO_BUILD= yes
-USE_TOOLS+= bash pax
-WRKSRC= ${WRKDIR}/${DISTFILES:C/.tar.[gx]z//}
-
-GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
- sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
-
-INSTALLATION_DIRS= bin ${PKGMANDIR} share/doc/cargo/bash_completion.d
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
-BROKEN+= "Bootstrap unavailable for old NetBSD version"
-.endif
-
-DISTFILES:= # empty
-
-# Rust upstream provided binaries
-
-.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= aarch64-apple-darwin
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= x86_64-apple-darwin
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= x86_64-unknown-freebsd
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= i686-unknown-linux-gnu
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if (${MACHINE_PLATFORM:MLinux-*-aarch64} && !empty(GLIBC_VERSION)) || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= aarch64-unknown-linux-gnu
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if (${MACHINE_PLATFORM:MLinux-*-aarch64} && empty(GLIBC_VERSION)) || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= aarch64-unknown-linux-musl
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if (${MACHINE_PLATFORM:MLinux-*-x86_64} && !empty(GLIBC_VERSION)) || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= x86_64-unknown-linux-gnu
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if (${MACHINE_PLATFORM:MLinux-*-x86_64} && empty(GLIBC_VERSION)) || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= x86_64-unknown-linux-musl
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= x86_64-unknown-netbsd
-DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
-
-# NetBSD provided binaries:
-
-NBSUF=
-
-.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= aarch64-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= aarch64_be-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= armv6-unknown-netbsd-eabihf
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= armv7-unknown-netbsd-eabihf
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= i586-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= powerpc-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= sparc64-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= mipsel-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make(makesum) || make(mdi)
-RUST_ARCH:= riscv64gc-unknown-netbsd
-DN:= ${DISTNAME}${NBSUF}
-EXTRACT_SUFX= .tar.xz
-DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-DISTFILES:= ${DISTFILES} ${DF}
-SITES.${DF}= ${NETBSD_REPO}
-.endif
-
-# Illumos:
-#.if ${MACHINE_PLATFORM:MSunOS-*-x86_64} || make(distinfo) || make(makesum) || make(mdi)
-#RUST_ARCH:= x86_64-unknown-illumos
-#DN:= ${DISTNAME}
-#EXTRACT_SUFX= .tar.gz
-#DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
-#DISTFILES:= ${DISTFILES} ${DF}
-#SITES.${DF}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
-#.endif
-
-
-# Binary still extracts to plain non-nb'ed directory
-WRKSRC:= ${WRKSRC:C/nb[0-9]*//}
-WRKSRC:= ${WRKSRC:C/-$//}
-
-do-install:
- cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC}
- cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \
- --destdir=${DESTDIR} --prefix=${PREFIX}
- ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp
- ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log
- ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/manifest-*
- ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh
-
-.if ${OPSYS} == "Darwin"
-.PHONY: fix-darwin-install-name
-post-install: fix-darwin-install-name
-fix-darwin-install-name:
-. for bin in cargo-clippy clippy-driver miri rls rust-analyzer rustc rustdoc rustfmt
- otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \
- | ${GREP} '@rpath' | while read rpath rest; do \
- install_name_tool -change $$rpath \
- `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
- ${DESTDIR}${PREFIX}/bin/${bin}; \
- done
-. endfor
-. for libexec in rust-analyzer-proc-macro-srv
- otool -XL ${DESTDIR}${PREFIX}/libexec/${libexec} \
- | ${GREP} '@rpath' | while read rpath rest; do \
- install_name_tool -change $$rpath \
- `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
- ${DESTDIR}${PREFIX}/libexec/${libexec}; \
- done
-. endfor
-. for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump \
- llvm-profdata llvm-readobj llvm-size llvm-strip
- otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \
- | ${GREP} '@rpath' | while read rpath rest; do \
- install_name_tool -change $$rpath \
- `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib/rustlib/${RUST_ARCH}/lib,g'` \
- ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}; \
- done
-. endfor
-. for lib in lib lib/rustlib/${RUST_ARCH}/lib lib/rustlib/${RUST_ARCH}/codegen-backends
- for f in ${DESTDIR}${PREFIX}/${lib}/lib*.dylib; do \
- [ ! -f $$f ] && continue; \
- install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
- otool -XL $$f | grep '@rpath' | while read rpath rest; do \
- install_name_tool -change $$rpath \
- `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
- $$f; \
- done; \
- done
-. endfor
-.else
-# Not Darwin:
-
-TOOL_DEPENDS+= patchelf-[0-9]*:../../devel/patchelf
-
-RUST_LLVM_RPATH= ${PREFIX}/lib
-FORCE_RPATH= --force-rpath
-
-# 32-bit NetBSD ports need libatomic
-. if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
- ${MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf} || \
- ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || \
- ${MACHINE_PLATFORM:MNetBSD-*-i386}
-. include "../../devel/libatomic/buildlink3.mk"
-. endif
-
-.PHONY: fix-relative-rpath
-post-install: fix-relative-rpath
-fix-relative-rpath:
-. for bin in \
- bin/cargo \
- bin/cargo-clippy \
- bin/cargo-fmt \
- bin/clippy-driver \
- bin/miri \
- bin/rls \
- bin/rust-analyzer \
- bin/rust-demangler \
- bin/rustc \
- bin/rustdoc \
- bin/rustfmt \
- libexec/rust-analyzer-proc-macro-srv
- if [ -f ${DESTDIR}${PREFIX}/${bin} ]; then \
- ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \
- ${PREFIX}/lib ${DESTDIR}${PREFIX}/${bin} ; \
- fi
-. endfor
-# Only Linux builds link these binaries against an LLVM library
-. if ${OPSYS} == "Linux"
-. for bin in llc llvm-ar llvm-as llvm-cov llvm-dis llvm-link llvm-nm llvm-objcopy \
- llvm-objdump llvm-profdata llvm-readobj llvm-size llvm-strip opt \
- rust-lld gcc-ld/ld64.lld gcc-ld/ld.lld gcc-ld/lld-link gcc-ld/wasm-ld
- ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \
- ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}
-. endfor
-. endif
-. for lib in lib lib/rustlib/${RUST_ARCH}/lib \
- lib/rustlib/${RUST_ARCH}/codegen-backends
- for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do \
- [ ! -f $$f ] && continue; \
- ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f; \
- done
-. endfor
-# wrong architecture binary distributed, unused except on macOS
-# https://github.com/rust-lang/rust/issues/139195
-# https://github.com/rust-lang/rust/issues/138943
- ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-objcopy
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/rust193-bin/buildlink3.mk b/rust193-bin/buildlink3.mk
deleted file mode 100644
index 8c92cdf53c..0000000000
--- a/rust193-bin/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/07/01 07:00:28 pin Exp $
-
-BUILDLINK_TREE+= rust-bin
-
-.if !defined(RUST_BIN_BUILDLINK3_MK)
-RUST_BIN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.rust-bin+= rust-bin>=1.85.0
-BUILDLINK_PKGSRCDIR.rust-bin?= ../../lang/rust-bin
-BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/lib/rustlib
-.endif
-
-BUILDLINK_TREE+= -rust-bin
diff --git a/rust193-bin/distinfo b/rust193-bin/distinfo
deleted file mode 100644
index 6ae00c4629..0000000000
--- a/rust193-bin/distinfo
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-aarch64-apple-darwin.tar.gz) = 79c7b27c43db89e7dd8165b6aa067944004ab5b3483b5ae39b1390b714a7cf6a
-SHA512 (rust-bin-1.93.1/rust-1.93.1-aarch64-apple-darwin.tar.gz) = a1335f2101121fff361c8f7b4f02242402e26144b745c27ddb774c3831c589cb9b9d987789a3f680ac5e7230aad74d1af12c782c5036f7bdd99b4615620b56fa
-Size (rust-bin-1.93.1/rust-1.93.1-aarch64-apple-darwin.tar.gz) = 389523068 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 1f4b87ad7fa9c95a14714ecfc588018d01ab2e1a4b1b69e8d1269bc764d7605b
-SHA512 (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 7b4b4f13e88761c25d32f667d3ea95335eaaebed8860198e840936b0513679e2ad8523a8e38e90ccd2698ee2cf557cea1f66ae3abaf1c740bc0a945250d440b1
-Size (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-linux-gnu.tar.gz) = 325195152 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-linux-musl.tar.gz) = 65f1b6f1ac74c4f223267635fbba2b13a36b4cff1015dc927c3de4e11f8b6dc6
-SHA512 (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-linux-musl.tar.gz) = 2f47087cbd50c960a775497232157f2ebbc98c3b6f696958b1bc4e9dadae0722d4b1f12b7ce2bca95248c1a4fca85d999aeeae37e3b774f941246de486669234
-Size (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-linux-musl.tar.gz) = 463084995 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-netbsd.tar.xz) = cf656d4bf8a59dbbb9938f27219667d340295b629631bff304d00f0580e3a1e1
-SHA512 (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-netbsd.tar.xz) = 34c2abbe246e7768a9e6575a56c44946265b0b5abd2e33e530627806122214f8b50001016ae7afe2612edf8c9cd8207da7d441281d0315ff15515cdcc130e93b
-Size (rust-bin-1.93.1/rust-1.93.1-aarch64-unknown-netbsd.tar.xz) = 208207380 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = cebdf42794d11d22584e62d8b1a9b817d6b5d0e9051a61a7ece603457ab8085a
-SHA512 (rust-bin-1.93.1/rust-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 0cd6ee89d6c34037cc2bb4c0d7287338ce1e33e64477c228b233b7d2de1658d8d0a8e41ef3aafd217d02ff86f7acfc5a38012828cead7b5cf64be3a56b2ea793
-Size (rust-bin-1.93.1/rust-1.93.1-aarch64_be-unknown-netbsd.tar.xz) = 208380456 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = d271a56b9ea20e4dda4168bd772418fd99e02c2bfe7c9d72537a7af7fdd2690f
-SHA512 (rust-bin-1.93.1/rust-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 8e4c8a1b7d22294e3772955bd3ea10f3851aabcec86c2b428e00d7b5c617fdda13442ee334ced75217930da6145d4af97381c9f7648e2c2b1a929e6375dd9897
-Size (rust-bin-1.93.1/rust-1.93.1-armv6-unknown-netbsd-eabihf.tar.xz) = 169020592 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 8d015d036ac2610e73d0dad3165c1f026bcda3a7c2bcb18e191c20c17380752f
-SHA512 (rust-bin-1.93.1/rust-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 714b49df36f8d7576d572f4319248241f559e4974fb51805053d2c668816730b820a9a4c631274b7a6acc8ba84ab6978bbd823c55ee11579a76a0b0dc66e3087
-Size (rust-bin-1.93.1/rust-1.93.1-armv7-unknown-netbsd-eabihf.tar.xz) = 171401360 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-i586-unknown-netbsd.tar.xz) = 5e8dc4147ab56e6deebe65ecf13958d9f3ec92ec9beeb902c7a9b15aaa013ca7
-SHA512 (rust-bin-1.93.1/rust-1.93.1-i586-unknown-netbsd.tar.xz) = 3684db056547e775450297917a9b9306c0d9502da5390ed700e04cdc543b11a1be583a32d1767eb6008f908eccb56e7af8f01c20534e7631f55f78f379486aa0
-Size (rust-bin-1.93.1/rust-1.93.1-i586-unknown-netbsd.tar.xz) = 232318896 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-i686-unknown-linux-gnu.tar.gz) = cde86c634105d76512aee8b6d5fe1ffec76547a32859ce201adad4b9232c6716
-SHA512 (rust-bin-1.93.1/rust-1.93.1-i686-unknown-linux-gnu.tar.gz) = 49698872bd436ebfd9b25d43fdf43857c06a0aa8099ecc1cee29872cbfe41fcda6e93aaabefd8efb8b9857637c95ad6e8bb490a92278604f5f2de533e23c4d9e
-Size (rust-bin-1.93.1/rust-1.93.1-i686-unknown-linux-gnu.tar.gz) = 505663577 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-mipsel-unknown-netbsd.tar.xz) = 89236ff31510f6ca88c80baa0967878de9435a616bc57b7b701ad098b7afbb6c
-SHA512 (rust-bin-1.93.1/rust-1.93.1-mipsel-unknown-netbsd.tar.xz) = 6de4edcd96093e6f7ae92e590a2e274e79f53dd92a3839d5e6ac57244ec616afdb53a01e2296f1fb093fc72fb855202ebe9f6355b77f51d044405827443f5cc3
-Size (rust-bin-1.93.1/rust-1.93.1-mipsel-unknown-netbsd.tar.xz) = 175612264 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-powerpc-unknown-netbsd.tar.xz) = 7e048eef2c195d90074404225a79b93d6c9cd27499d8f48ac0caf04f6d39084b
-SHA512 (rust-bin-1.93.1/rust-1.93.1-powerpc-unknown-netbsd.tar.xz) = 4c88e730af4e1030e72f646213c355a3ba729e5944bbd5f142403649188ea51ed7baff53dde6266721c1e22f1f342d5c1d08ef3faab24623f52033cade65f71e
-Size (rust-bin-1.93.1/rust-1.93.1-powerpc-unknown-netbsd.tar.xz) = 116419424 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = d693dd6da9c2372660dc84a6c4c8317f56b978a5f803ab54a2c2ca4e85c64693
-SHA512 (rust-bin-1.93.1/rust-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = 591e6e2ea7206dc8f0e75f108aaf09fbea39de8e52dc7df97ac9d3ba14ca8cba09e9e34a25dffcec38c728ce3d831efd566bfd58bac6629739405cbdb680431c
-Size (rust-bin-1.93.1/rust-1.93.1-riscv64gc-unknown-netbsd.tar.xz) = 226861692 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-sparc64-unknown-netbsd.tar.xz) = 199fa7be5bed6e63ae5b58c15c13d26796334aebb7e2f94c1aa1fa931e1ff8df
-SHA512 (rust-bin-1.93.1/rust-1.93.1-sparc64-unknown-netbsd.tar.xz) = f0e228a949ebffbb7a683be007a7e0bc56f7c739fd4e81d6e9fc078daee0c2ec4c7b146568e38b6963cfc9fe4bdaeabc283b93221c74fd9ac2dc926bc6b62fe7
-Size (rust-bin-1.93.1/rust-1.93.1-sparc64-unknown-netbsd.tar.xz) = 204802412 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-x86_64-apple-darwin.tar.gz) = 9b120fea3fe39fa4c035e9269fadd5a949374f897e83137af856aebd6ab0977a
-SHA512 (rust-bin-1.93.1/rust-1.93.1-x86_64-apple-darwin.tar.gz) = d5689f4cc9ddf3eb15bbdab5ebbaa274431fcc34863dc963041b6be767b8c9c9dd145ae0a542f64ab853d59e1f8fddad7bda7d8b7dae98aad831e3ee5a8ffbc5
-Size (rust-bin-1.93.1/rust-1.93.1-x86_64-apple-darwin.tar.gz) = 335166016 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-freebsd.tar.gz) = 6227131a3bae4ff1b8a6f7d0acdfb2f493dc80b487d4a37249d561e1e27c7f6c
-SHA512 (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-freebsd.tar.gz) = c6d9d9064f51bcdab4e391cbcbd2b2ce38c9781a689cbee890192cccf1e162c5087ebe1f30750d6b255d631fc03f1f4806145764126ea97df84833128d1e37b4
-Size (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-freebsd.tar.gz) = 388358160 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = a8c1a2896e879526811c7c7e5101bb01046b59f213ac4ebfad1bd6290989d15d
-SHA512 (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = d5db54ebca4b7c94237cf700340d789438ffa87df0739e63f60d05d61117861abafccbccdc6d57e374f4571b4e5a66270f411b5f8bba878ae7fbb0d32d32597c
-Size (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-linux-gnu.tar.gz) = 374862018 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-linux-musl.tar.gz) = 7bceb3a19300a0740d1226931b6179bca93de37558694cd6d975536930d08747
-SHA512 (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-linux-musl.tar.gz) = c23d38a1d79ffd238ab6e597421ffaccdadf80f4d7c6dde979e0d19d59eac27d9b50083805269399adf7bd89177a83511f7fe173452b70f7114e5b01250b4cbe
-Size (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-linux-musl.tar.gz) = 549816929 bytes
-BLAKE2s (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-netbsd.tar.gz) = ad3bfcfe31c8f1a325b2c72ecc6b146a5363bac948ddd0d3e544a05d30065170
-SHA512 (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-netbsd.tar.gz) = 40039dc5f7415d88ba5d461f044c421d82819b1a1fa23fdacdbcc54fe8a06585ba473187d6cb40764ba1504fdd6b12c754868d621f3209aee17aec667d2d5dd2
-Size (rust-bin-1.93.1/rust-1.93.1-x86_64-unknown-netbsd.tar.gz) = 410939665 bytes
diff --git a/rust193-bin/files/install.sh b/rust193-bin/files/install.sh
deleted file mode 100755
index 1cc270c333..0000000000
--- a/rust193-bin/files/install.sh
+++ /dev/null
@@ -1,971 +0,0 @@
-#!/bin/bash
-# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
-# No undefined variables
-set -u
-
-init_logging() {
- local _abs_libdir="$1"
- local _logfile="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/install.log"
- LOGFILE="$_logfile"
-}
-
-log_line() {
- local _line="$1"
-
-}
-
-msg() {
- local _line="install: ${1-}"
- echo "$_line"
- log_line "$_line"
-}
-
-verbose_msg() {
- if [ -n "${CFG_VERBOSE-}" ]; then
- msg "${1-}"
- else
- log_line "install: ${1-}"
- fi
-}
-
-step_msg() {
- msg
- msg "$1"
- msg
-}
-
-verbose_step_msg() {
- if [ -n "${CFG_VERBOSE-}" ]; then
- msg
- msg "$1"
- msg
- else
- log_line ""
- log_line "install: $1"
- log_line ""
- fi
-}
-
-warn() {
- local _line="install: WARNING: $1"
- echo "$_line" >&2
- log_line "$_line"
-}
-
-err() {
- local _line="install: error: $1"
- echo "$_line" >&2
- log_line "$_line"
- exit 1
-}
-
-# A non-user error that is likely to result in a corrupted install
-critical_err() {
- local _line="install: error: $1. see logs at '${LOGFILE-}'"
- echo "$_line" >&2
- log_line "$_line"
- exit 1
-}
-
-need_ok() {
- if [ $? -ne 0 ]
- then
- err "$1"
- fi
-}
-
-critical_need_ok() {
- if [ $? -ne 0 ]
- then
- critical_err "$1"
- fi
-}
-
-want_ok() {
- if [ $? -ne 0 ]; then
- warn "$1"
- fi
-}
-
-assert_nz() {
- if [ -z "$1" ]; then err "assert_nz $2"; fi
-}
-
-need_cmd() {
- if command -v $1 >/dev/null 2>&1
- then verbose_msg "found $1"
- else err "need $1"
- fi
-}
-
-run() {
- local _line="\$ $*"
- "$@"
- local _retval=$?
- log_line "$_line"
- return $_retval
-}
-
-write_to_file() {
- local _msg="$1"
- local _file="$2"
- local _line="$ echo \"$_msg\" > \"$_file\""
- echo "$_msg" > "$_file"
- local _retval=$?
- log_line "$_line"
- return $_retval
-}
-
-append_to_file() {
- local _msg="$1"
- local _file="$2"
- local _line="$ echo \"$_msg\" >> \"$_file\""
- echo "$_msg" >> "$_file"
- local _retval=$?
- log_line "$_line"
- return $_retval
-}
-
-make_dir_recursive() {
- local _dir="$1"
- local _line="$ umask 022 && mkdir -p \"$_dir\""
- umask 022 && mkdir -p "$_dir"
- local _retval=$?
- log_line "$_line"
- return $_retval
-}
-
-putvar() {
- local t
- local tlen
- eval t=\$$1
- eval tlen=\${#$1}
-}
-
-valopt() {
- VAL_OPTIONS="$VAL_OPTIONS $1"
-
- local op=$1
- local default=$2
- shift
- shift
- local doc="$*"
- if [ $HELP -eq 0 ]
- then
- local uop=$(echo $op | tr 'a-z-' 'A-Z_')
- local v="CFG_${uop}"
- eval $v="$default"
- for arg in $CFG_ARGS
- do
- if echo "$arg" | grep -q -- "--$op="
- then
- local val=$(echo "$arg" | cut -f2 -d=)
- eval $v=$val
- fi
- done
- putvar $v
- else
- if [ -z "$default" ]
- then
- default="<none>"
- fi
- op="${op}=[${default}]"
- printf " --%-30s %s\n" "$op" "$doc"
- fi
-}
-
-opt() {
- BOOL_OPTIONS="$BOOL_OPTIONS $1"
-
- local op=$1
- local default=$2
- shift
- shift
- local doc="$*"
- local flag=""
-
- if [ $default -eq 0 ]
- then
- flag="enable"
- else
- flag="disable"
- doc="don't $doc"
- fi
-
- if [ $HELP -eq 0 ]
- then
- for arg in $CFG_ARGS
- do
- if [ "$arg" = "--${flag}-${op}" ]
- then
- op=$(echo $op | tr 'a-z-' 'A-Z_')
- flag=$(echo $flag | tr 'a-z' 'A-Z')
- local v="CFG_${flag}_${op}"
- eval $v=1
- putvar $v
- fi
- done
- else
- if [ ! -z "${META-}" ]
- then
- op="$op=<$META>"
- fi
- printf " --%-30s %s\n" "$flag-$op" "$doc"
- fi
-}
-
-flag() {
- BOOL_OPTIONS="$BOOL_OPTIONS $1"
-
- local op=$1
- shift
- local doc="$*"
-
- if [ $HELP -eq 0 ]
- then
- for arg in $CFG_ARGS
- do
- if [ "$arg" = "--${op}" ]
- then
- op=$(echo $op | tr 'a-z-' 'A-Z_')
- local v="CFG_${op}"
- eval $v=1
- putvar $v
- fi
- done
- else
- if [ ! -z "${META-}" ]
- then
- op="$op=<$META>"
- fi
- printf " --%-30s %s\n" "$op" "$doc"
- fi
-}
-
-validate_opt () {
- for arg in $CFG_ARGS
- do
- local is_arg_valid=0
- for option in $BOOL_OPTIONS
- do
- if test --disable-$option = $arg
- then
- is_arg_valid=1
- fi
- if test --enable-$option = $arg
- then
- is_arg_valid=1
- fi
- if test --$option = $arg
- then
- is_arg_valid=1
- fi
- done
- for option in $VAL_OPTIONS
- do
- if echo "$arg" | grep -q -- "--$option="
- then
- is_arg_valid=1
- fi
- done
- if [ "$arg" = "--help" ]
- then
- echo
- echo "No more help available for Configure options,"
- echo "check the Wiki or join our IRC channel"
- break
- else
- if test $is_arg_valid -eq 0
- then
- err "Option '$arg' is not recognized"
- fi
- fi
- done
-}
-
-absolutify() {
- local file_path="$1"
- local file_path_dirname="$(dirname "$file_path")"
- local file_path_basename="$(basename "$file_path")"
- local file_abs_path="$(abs_path "$file_path_dirname")"
- local file_path="$file_abs_path/$file_path_basename"
- # This is the return value
- RETVAL="$file_path"
-}
-
-# Prints the absolute path of a directory to stdout
-abs_path() {
- local path="$1"
- # Unset CDPATH because it causes havok: it makes the destination unpredictable
- # and triggers 'cd' to print the path to stdout. Route `cd`'s output to /dev/null
- # for good measure.
- (unset CDPATH && cd "$path" > /dev/null && pwd)
-}
-
-uninstall_legacy() {
- local _abs_libdir="$1"
-
- local _uninstalled_something=false
-
- # Replace commas in legacy manifest list with spaces
- _legacy_manifest_dirs=`echo "$TEMPLATE_LEGACY_MANIFEST_DIRS" | sed "s/,/ /g"`
-
- # Uninstall from legacy manifests
- local _md
- for _md in $_legacy_manifest_dirs; do
- # First, uninstall from the installation prefix.
- # Errors are warnings - try to rm everything in the manifest even if some fail.
- if [ -f "$_abs_libdir/$_md/manifest" ]
- then
-
- # iterate through installed manifest and remove files
- local _p;
- while read _p; do
- # the installed manifest contains absolute paths
- msg "removing legacy file $_p"
- if [ -f "$_p" ]
- then
- run rm -f "$_p"
- want_ok "failed to remove $_p"
- else
- warn "supposedly installed file $_p does not exist!"
- fi
- done < "$_abs_libdir/$_md/manifest"
-
- # If we fail to remove $md below, then the
- # installed manifest will still be full; the installed manifest
- # needs to be empty before install.
- msg "removing legacy manifest $_abs_libdir/$_md/manifest"
- run rm -f "$_abs_libdir/$_md/manifest"
- # For the above reason, this is a hard error
- need_ok "failed to remove installed manifest"
-
- # Remove $template_rel_manifest_dir directory
- msg "removing legacy manifest dir $_abs_libdir/$_md"
- run rm -R "$_abs_libdir/$_md"
- want_ok "failed to remove $_md"
-
- _uninstalled_something=true
- fi
- done
-
- RETVAL="$_uninstalled_something"
-}
-
-uninstall_components() {
- local _abs_libdir="$1"
- local _dest_prefix="$2"
- local _components="$3"
-
- # We're going to start by uninstalling existing components. This
- local _uninstalled_something=false
-
- # First, try removing any 'legacy' manifests from before
- # rust-installer
- uninstall_legacy "$_abs_libdir"
- assert_nz "$RETVAL", "RETVAL"
- if [ "$RETVAL" = true ]; then
- _uninstalled_something=true;
- fi
-
- # Load the version of the installed installer
- local _installed_version=
- if [ -f "$abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/rust-installer-version" ]; then
- _installed_version=`cat "$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/rust-installer-version"`
-
- # Sanity check
- if [ ! -n "$_installed_version" ]; then critical_err "rust installer version is empty"; fi
- fi
-
- # If there's something installed, then uninstall
- if [ -n "$_installed_version" ]; then
- # Check the version of the installed installer
- case "$_installed_version" in
-
- # If this is a previous version, then upgrade in place to the
- # current version before uninstalling.
- 2 )
- # The only change between version 2 -> 3 is that components are placed
- # in subdirectories of the installer tarball. There are no changes
- # to the installed data format, so nothing to do.
- ;;
-
- # This is the current version. Nothing need to be done except uninstall.
- "$TEMPLATE_RUST_INSTALLER_VERSION")
- ;;
-
- # If this is an unknown (future) version then bail.
- * )
- echo "The copy of $TEMPLATE_PRODUCT_NAME at $_dest_prefix was installed using an"
- echo "unknown version ($_installed_version) of rust-installer."
- echo "Uninstall it first with the installer used for the original installation"
- echo "before continuing."
- exit 1
- ;;
- esac
-
- local _md="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR"
- local _installed_components="$(cat "$_md/components")"
-
- # Uninstall (our components only) before reinstalling
- local _available_component
- for _available_component in $_components; do
- local _installed_component
- for _installed_component in $_installed_components; do
- if [ "$_available_component" = "$_installed_component" ]; then
- msg "uninstalling component '$_available_component'"
- local _component_manifest="$_md/manifest-$_installed_component"
-
- # Sanity check: there should be a component manifest
- if [ ! -f "$_component_manifest" ]; then
- critical_err "installed component '$_installed_component' has no manifest"
- fi
-
- # Iterate through installed component manifest and remove files
- local _directive
- while read _directive; do
-
- local _command=${_directive%%:*}
- local _file=${_directive#*:}
-
- # Sanity checks
- if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
- if [ ! -n "$_file" ]; then critical_err "malformed installation directive"; fi
-
- case "$_command" in
- file)
- verbose_msg "removing file $_file"
- if [ -f "$_file" ]; then
- run rm -f "$_file"
- want_ok "failed to remove $_file"
- else
- warn "supposedly installed file $_file does not exist!"
- fi
- ;;
-
- dir)
- verbose_msg "removing directory $_file"
- run rm -r "$_file"
- want_ok "unable to remove directory $_file"
- ;;
-
- *)
- critical_err "unknown installation directive"
- ;;
- esac
-
- done < "$_component_manifest"
-
- # Remove the installed component manifest
- verbose_msg "removing component manifest $_component_manifest"
- run rm "$_component_manifest"
- # This is a hard error because the installation is unrecoverable
- critical_need_ok "failed to remove installed manifest for component '$_installed_component'"
-
- # Update the installed component list
- local _modified_components="$(sed "/^$_installed_component\$/d" "$_md/components")"
- write_to_file "$_modified_components" "$_md/components"
- critical_need_ok "failed to update installed component list"
- fi
- done
- done
-
- # If there are no remaining components delete the manifest directory,
- # but only if we're doing an uninstall - if we're doing an install,
- # then leave the manifest directory around to hang onto the logs,
- # and any files not managed by the installer.
- if [ -n "${CFG_UNINSTALL-}" ]; then
- local _remaining_components="$(cat "$_md/components")"
- if [ ! -n "$_remaining_components" ]; then
- verbose_msg "removing manifest directory $_md"
- run rm -r "$_md"
- want_ok "failed to remove $_md"
-
- maybe_unconfigure_ld
- fi
- fi
-
- _uninstalled_something=true
- fi
-
- # There's no installed version. If we were asked to uninstall, then that's a problem.
- if [ -n "${CFG_UNINSTALL-}" -a "$_uninstalled_something" = false ]
- then
- err "unable to find installation manifest at $CFG_LIBDIR/$TEMPLATE_REL_MANIFEST_DIR"
- fi
-}
-
-install_components() {
- local _src_dir="$1"
- local _abs_libdir="$2"
- local _dest_prefix="$3"
- local _components="$4"
-
- local _component
- for _component in $_components; do
-
- msg "installing component '$_component'"
-
- # The file name of the manifest we're installing from
- local _input_manifest="$_src_dir/$_component/manifest.in"
-
- # Sanity check: do we have our input manifests?
- if [ ! -f "$_input_manifest" ]; then
- critical_err "manifest for $_component does not exist at $_input_manifest"
- fi
-
- # The installed manifest directory
- local _md="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR"
-
- # The file name of the manifest we're going to create during install
- local _installed_manifest="$_md/manifest-$_component"
-
- # Create the installed manifest, which we will fill in with absolute file paths
- touch "$_installed_manifest"
- critical_need_ok "failed to create installed manifest"
-
- # Add this component to the installed component list
- append_to_file "$_component" "$_md/components"
- critical_need_ok "failed to update components list for $_component"
-
- # Now install, iterate through the new manifest and copy files
- local _directive
- while read _directive; do
-
- local _command=${_directive%%:*}
- local _file=${_directive#*:}
-
- # Sanity checks
- if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
- if [ ! -n "$_file" ]; then critical_err "malformed installation directive"; fi
-
- # Decide the destination of the file
- local _file_install_path="$_dest_prefix/$_file"
-
- case "$_file" in
- etc/*)
- local _f=${_file#"etc/"}
- _file_install_path="$CFG_DESTDIR_PREFIX/share/doc/cargo/$_f"
- ;;
- bin/*)
- local _f=${_file#"bin/"}
- _file_install_path="$CFG_BINDIR/$_f"
- ;;
- lib/*)
- local _f=${_file#"lib/"}
- _file_install_path="$CFG_LIBDIR/$_f"
- ;;
- share/man/*)
- local _f=${_file#"share/man/"}
- _file_install_path="$CFG_DESTDIR_PREFIX/$PKGMANDIR/$_f"
- ;;
- share/doc/*)
- # HACK: Try to support overriding --docdir. Paths with the form
- # "share/doc/$product/" can be redirected to a single --docdir
- # path. If the following detects that --docdir has been specified
- # then it will replace everything preceeding the "$product" path
- # component. The problem here is that the combined rust installer
- # contains two "products": rust and cargo; so the contents of those
- # directories will both be dumped into the same directory; and the
- # contents of those directories are _not_ disjoint. Since this feature
- # is almost entirely to support 'make install' anyway I don't expect
- # this problem to be a big deal in practice.
- if [ "$CFG_DOCDIR" != "<default>" ]; then
- local _f=${_file#"share/doc/"*/}
- _file_install_path="$CFG_DOCDIR/$_f"
- fi
- ;;
- share/*)
- local _f=${_file#"share/"}
- _file_install_path="$CFG_DATADIR/$_f"
- ;;
- esac
-
-
- # Make sure there's a directory for it
- make_dir_recursive "$(dirname "$_file_install_path")"
- critical_need_ok "directory creation failed"
-
- # Make the path absolute so we can uninstall it later without
- # starting from the installation cwd
- absolutify "$_file_install_path"
- _file_install_path="$RETVAL"
- assert_nz "$_file_install_path" "file_install_path"
-
- case "$_command" in
- file )
-
- verbose_msg "copying file $_file_install_path"
-
- maybe_backup_path "$_file_install_path"
-
- local mode=644
- if test -x "$_src_dir/$_component/$_file"; then
- mode=755
- fi
- case "$_file" in
- bin/*) mode=755
- ;;
- esac
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
- run chmod $mode "$_file_install_path"
- critical_need_ok "file creation failed"
-
- # Update the manifest
- append_to_file "file:$_file_install_path" "$_installed_manifest"
- critical_need_ok "failed to update manifest"
-
- ;;
-
- dir )
-
- 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"
-
- # Set permissions. 0755 for dirs, 644 for files
- run chmod -R u+rwX,go+rX,go-w "$_file_install_path"
- critical_need_ok "failed to set permissions on directory"
-
- # Update the manifest
- append_to_file "dir:$_file_install_path" "$_installed_manifest"
- critical_need_ok "failed to update manifest"
- ;;
-
- *)
- critical_err "unknown installation directive"
- ;;
- esac
- done < "$_input_manifest"
-
- done
-}
-
-maybe_configure_ld() {
- local _abs_libdir="$1"
-
- local _ostype="$(uname -s)"
- assert_nz "$_ostype" "ostype"
-
- if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then
-
- # Fedora-based systems do not configure the dynamic linker to look
- # /usr/local/lib, which is our default installation directory. To
- # make things just work, try to put that directory in
- # /etc/ld.so.conf.d/rust-installer-v1 so ldconfig picks it up.
- # Issue #30.
- #
- # This will get rm'd when the last component is uninstalled in
- # maybe_unconfigure_ld.
- if [ "$_abs_libdir" = "/usr/local/lib" -a -d "/etc/ld.so.conf.d" ]; then
- echo "$_abs_libdir" > "/etc/ld.so.conf.d/rust-installer-v1-$TEMPLATE_REL_MANIFEST_DIR.conf"
- if [ $? -ne 0 ]; then
- # This shouldn't happen if we've gotten this far
- # installing to /usr/local
- warn "failed to update /etc/ld.so.conf.d. this is unexpected"
- fi
- fi
-
- verbose_msg "running ldconfig"
- if [ -n "${CFG_VERBOSE-}" ]; then
- ldconfig
- else
- ldconfig 2> /dev/null
- fi
- if [ $? -ne 0 ]
- then
- warn "failed to run ldconfig. this may happen when not installing as root. run with --verbose to see the error"
- fi
- fi
-}
-
-maybe_unconfigure_ld() {
- local _ostype="$(uname -s)"
- assert_nz "$_ostype" "ostype"
-
- if [ "$_ostype" != "Linux" ]; then
- return 0
- fi
-
- rm "/etc/ld.so.conf.d/rust-installer-v1-$TEMPLATE_REL_MANIFEST_DIR.conf" 2> /dev/null
- # Above may fail since that file may not have been created on install
-}
-
-# Doing our own 'install'-like backup that is consistent across platforms
-maybe_backup_path() {
- local _file_install_path="$1"
-
- if [ -e "$_file_install_path" ]; then
- msg "backing up existing file at $_file_install_path"
- run mv -f "$_file_install_path" "$_file_install_path.old"
- critical_need_ok "failed to back up $_file_install_path"
- fi
-}
-
-install_uninstaller() {
- local _src_dir="$1"
- local _src_basename="$2"
- local _abs_libdir="$3"
-
- local _uninstaller="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/uninstall.sh"
- msg "creating uninstall script at $_uninstaller"
- run cp "$_src_dir/$_src_basename" "$_uninstaller"
- critical_need_ok "unable to install uninstaller"
-}
-
-do_preflight_sanity_checks() {
- local _src_dir="$1"
- local _dest_prefix="$2"
-
- # Sanity check: can we can write to the destination?
- verbose_msg "verifying destination is writable"
- make_dir_recursive "$CFG_LIBDIR"
- need_ok "can't write to destination. consider \`sudo\`."
- touch "$CFG_LIBDIR/rust-install-probe" > /dev/null
- if [ $? -ne 0 ]
- then
- err "can't write to destination. consider \`sudo\`."
- fi
- rm "$CFG_LIBDIR/rust-install-probe"
- need_ok "failed to remove install probe"
-
- # Sanity check: don't install to the directory containing the installer.
- # That would surely cause chaos.
- verbose_msg "verifying destination is not the same as source"
- local _prefix_dir="$(abs_path "$dest_prefix")"
- if [ "$_src_dir" = "$_dest_prefix" -a "${CFG_UNINSTALL-}" != 1 ]; then
- err "cannot install to same directory as installer"
- fi
-}
-
-verbose_msg "looking for install programs"
-verbose_msg
-
-need_cmd mkdir
-need_cmd printf
-need_cmd cut
-need_cmd grep
-need_cmd uname
-need_cmd tr
-need_cmd sed
-need_cmd chmod
-need_cmd env
-need_cmd pwd
-
-CFG_ARGS="${@:-}"
-
-HELP=0
-if [ "${1-}" = "--help" ]
-then
- HELP=1
- shift
- echo
- echo "Usage: $0 [options]"
- echo
- echo "Options:"
- echo
-else
- verbose_step_msg "processing arguments"
-fi
-
-OPTIONS=""
-BOOL_OPTIONS=""
-VAL_OPTIONS=""
-
-flag uninstall "only uninstall from the installation prefix"
-valopt destdir "" "set installation root"
-valopt prefix "/usr/local" "set installation prefix"
-
-# Avoid prepending an extra / to the prefix path if there's no destdir
-# NB: CFG vars here are undefined when passing --help
-if [ -z "${CFG_DESTDIR-}" ]; then
- CFG_DESTDIR_PREFIX="${CFG_PREFIX-}"
-else
- CFG_DESTDIR_PREFIX="$CFG_DESTDIR/$CFG_PREFIX"
-fi
-
-# NB This isn't quite the same definition as in `configure`.
-# just using 'lib' instead of configure's CFG_LIBDIR_RELATIVE
-valopt without "" "comma-separated list of components to not install"
-valopt components "" "comma-separated list of components to install"
-flag list-components "list available components"
-valopt sysconfdir "$CFG_DESTDIR_PREFIX/etc" "install system configuration files"
-valopt bindir "$CFG_DESTDIR_PREFIX/bin" "install binaries"
-valopt libdir "$CFG_DESTDIR_PREFIX/lib" "install libraries"
-valopt datadir "$CFG_DESTDIR_PREFIX/share" "install data"
-# NB We repeat datadir default value because we don't set CFG_DATADIR in --help
-valopt mandir "${CFG_DATADIR-"$CFG_DESTDIR_PREFIX/share"}/man" "install man pages in PATH"
-# NB See the docdir handling in install_components for an explanation of this
-# weird <default> string
-valopt docdir "\<default\>" "install documentation in PATH"
-opt ldconfig 1 "run ldconfig after installation (Linux only)"
-opt verify 1 "obsolete"
-flag verbose "run with verbose output"
-
-if [ $HELP -eq 1 ]
-then
- echo
- exit 0
-fi
-
-verbose_step_msg "validating arguments"
-validate_opt
-
-# Template configuration.
-# These names surrounded by '%%` are replaced by sed when generating install.sh
-# FIXME: Might want to consider loading this from a file and not generating install.sh
-
-# Rust or Cargo
-TEMPLATE_PRODUCT_NAME='Rust'
-# rustlib or cargo
-TEMPLATE_REL_MANIFEST_DIR=rustlib
-# 'Rust is ready to roll.' or 'Cargo is cool to cruise.'
-TEMPLATE_SUCCESS_MESSAGE='rust installed.'
-# Locations to look for directories containing legacy, pre-versioned manifests
-TEMPLATE_LEGACY_MANIFEST_DIRS='rustlib,cargo'
-# The installer version
-TEMPLATE_RUST_INSTALLER_VERSION='3'
-
-# OK, let's get installing ...
-
-# This is where we are installing from
-src_dir="$(abs_path $(dirname "$0"))"
-
-# The name of the script
-src_basename="$(basename "$0")"
-
-# If we've been run as 'uninstall.sh' (from the existing installation)
-# then we're doing a full uninstall, as opposed to the --uninstall flag
-# which just means 'uninstall my components'.
-if [ "$src_basename" = "uninstall.sh" ]; then
- if [ "${*:-}" != "" ]; then
- # Currently don't know what to do with arguments in this mode
- err "uninstall.sh does not take any arguments"
- fi
- CFG_UNINSTALL=1
- CFG_DESTDIR_PREFIX="$(abs_path "$src_dir/../../")"
- CFG_LIBDIR="$(abs_path "$src_dir/../")"
-fi
-
-# This is where we are installing to
-dest_prefix="$CFG_DESTDIR_PREFIX"
-
-# Open the components file to get the list of components to install.
-# NB: During install this components file is read from the installer's
-# source dir, during a full uninstall it's read from the manifest dir,
-# and thus contains all installed components.
-components=`cat "$src_dir/components"`
-
-# Sanity check: do we have components?
-if [ ! -n "$components" ]; then
- err "unable to find installation components"
-fi
-
-# If the user asked for a component list, do that and exit
-if [ -n "${CFG_LIST_COMPONENTS-}" ]; then
- echo
- echo "# Available components"
- echo
- for component in $components; do
- echo "* $component"
- done
- echo
- exit 0
-fi
-
-# If the user specified which components to install/uninstall,
-# then validate that they exist and select them for installation
-if [ -n "$CFG_COMPONENTS" ]; then
- # Remove commas
- user_components="$(echo "$CFG_COMPONENTS" | sed "s/,/ /g")"
- for user_component in $user_components; do
- found=false
- for my_component in $components; do
- if [ "$user_component" = "$my_component" ]; then
- found=true
- fi
- done
- if [ "$found" = false ]; then
- err "unknown component: $user_component"
- fi
- done
- components="$user_components"
-fi
-
-if [ -n "$CFG_WITHOUT" ]; then
- without_components="$(echo "$CFG_WITHOUT" | sed "s/,/ /g")"
- for without_component in $without_components; do
- components="$(echo "$components" | sed "s/$without_component//" | sed "s/$without_component//")"
- done
-fi
-
-if [ -z "$components" ]; then
- if [ -z "${CFG_UNINSTALL-}" ]; then
- err "no components selected for installation"
- else
- err "no components selected for uninstallation"
- fi
-fi
-
-do_preflight_sanity_checks "$src_dir" "$dest_prefix"
-
-# Using an absolute path to libdir in a few places so that the status
-# messages are consistently using absolute paths.
-absolutify "$CFG_LIBDIR"
-abs_libdir="$RETVAL"
-assert_nz "$abs_libdir" "abs_libdir"
-
-# Create the manifest directory, where we will put our logs
-make_dir_recursive "$abs_libdir/$TEMPLATE_REL_MANIFEST_DIR"
-need_ok "failed to create $TEMPLATE_REL_MANIFEST_DIR"
-
-# Log messages and commands
-init_logging "$abs_libdir"
-
-# First do any uninstallation, including from legacy manifests. This
-# will also upgrade the metadata of existing installs.
-uninstall_components "$abs_libdir" "$dest_prefix" "$components"
-
-# If we're only uninstalling then exit
-if [ -n "${CFG_UNINSTALL-}" ]
-then
- echo
- echo " $TEMPLATE_PRODUCT_NAME is uninstalled."
- echo
- exit 0
-fi
-
-# Create the manifest directory again! uninstall_legacy
-# may have deleted it.
-make_dir_recursive "$abs_libdir/$TEMPLATE_REL_MANIFEST_DIR"
-need_ok "failed to create $TEMPLATE_REL_MANIFEST_DIR"
-
-# Drop the version number into the manifest dir
-write_to_file "$TEMPLATE_RUST_INSTALLER_VERSION" "$abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/rust-installer-version"
-critical_need_ok "failed to write installer version"
-
-# Install the uninstaller
-
-# Install each component
-install_components "$src_dir" "$abs_libdir" "$dest_prefix" "$components"
-
-# Make dynamic libraries available to the linker
-maybe_configure_ld "$abs_libdir"
-
-echo
-echo " $TEMPLATE_SUCCESS_MESSAGE"
-echo
-
-
diff --git a/rust193/DESCR b/rust193/DESCR
deleted file mode 100644
index 6dc90a671e..0000000000
--- a/rust193/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 81133db2ec..0000000000
--- a/rust193/HOWTO-BOOTSTRAP
+++ /dev/null
@@ -1,85 +0,0 @@
-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
deleted file mode 100644
index c64be62cec..0000000000
--- a/rust193/Makefile
+++ /dev/null
@@ -1,800 +0,0 @@
-# $NetBSD: Makefile,v 1.339 2025/06/17 15:19:17 jperkin Exp $
-
-DISTNAME= rustc-1.93.1-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.92.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+= e2817c457afa7efc0f2ca62ce9dab5254eb5ddd9a5fd9e75bba2789be92c7b14
-CKSUMS+= 6e62515e67910aea2f04b64c643aa2545732f9dd7bf0abf87d8accf8c2c1fb88
-CKSUMS+= ccc5252660386fbfec2d66423f2dc87e6da74efd39ca0fcd7c7fd583056725c1
-CKSUMS+= ac5501e7bff0f4384db0537307b362bf1bcb120d8b5859e5f08bd796e78feaea
-CKSUMS+= 6d2c2831119e059d35e81a89b08195a29e325f68acfd86a3a7157ebf8e78182d
-
-CKSUM_CRATES+= vendor/openssl-src-300.5.4+3.5.4
-CKSUMS+= 33f1e78110293a8558ae997ed57e7aac72c5bfd47a241dc7f6e2ffa98b7a7137
-CKSUMS+= d0232a8b63c2fb396ed7551eb983b16b6ebafbba4b33d4434e167b05ee290f8f
-# 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/openssl-sys-0.9.111
-CKSUMS+= 0c5a4bd38ed007182cfec3cf0824a4806e5c629b9d69e3cc2a5b6e9be3eec280
-CKSUMS+= 777a22f3cd39ad01f2e559ecf600bb9c03ec42e0b9fbe41746f42938e162d523
-CKSUMS+= d17fa8715a43ff0da872ac504abb2cc0a395644e8f5c8c128812758c458d5963
-CKSUMS+= 02d5de4e4976450f8e665e0eff664e93063dd53aec2cb75ecee0847e3c0c086e
-
-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+= 1cab8d313161004e10463c6fd37c0846b31dbb7ccd0dbb509dd4e3edd94dda5b
-
-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}
-USE_TOOLS+= paxctl
-# Turn off Address space layout randomization
-# so that we can build firefox natively:
-post-install:
- ${TOOLS_PLATFORM.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.20.1 libcrypto.so.3 libcurl.so.4 \
- libssl.so.3 libz.so.1 libzstd.so.1; do \
- ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
- done; \
- 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/* \
- ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/bin/*/*; do \
- /bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \
- ${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \
- done; \
- cd ${WRKDIR}; ${GTAR} -zcf ${BOOTSTRAP_NAME}.tar.gz ${BOOTSTRAP_NAME}
- @${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
-
-.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
deleted file mode 100644
index d4e9e2a261..0000000000
--- a/rust193/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $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.85.0
-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
deleted file mode 100644
index 5eb1aaa9ef..0000000000
--- a/rust193/cargo.mk
+++ /dev/null
@@ -1,121 +0,0 @@
-# $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
deleted file mode 100644
index 816bed847a..0000000000
--- a/rust193/cross.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# $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= /u/m68k
-#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
-#GNU_CROSS_TARGET= m68k--netbsdelf
-#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
-#TARGET= m68k-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
deleted file mode 100644
index c1d315cab7..0000000000
--- a/rust193/distinfo
+++ /dev/null
@@ -1,177 +0,0 @@
-$NetBSD: distinfo,v 1.159 2023/06/19 14:46:47 bsiegert Exp $
-
-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-illumos.tar.gz) = 7b2bbcd43c9651d4969ee59749deabc8b1984e90bb2f34dc21f90310caa2e689
-SHA512 (rust-1.92.0-x86_64-unknown-illumos.tar.gz) = c86b216da31e6e4c02070bd48e01302ecf492ca3cf55aa5ce647e9a5d833625bd4b77179394c9cca67381aaa5f3f836b63b6fdb9958af4998becacabda2c6e10
-Size (rust-1.92.0-x86_64-unknown-illumos.tar.gz) = 253256062 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.1-src.tar.gz) = 72087427e1c368c510643b887cd8923df91b3d4223fc788904002798d346b711
-SHA512 (rustc-1.93.1-src.tar.gz) = f93b639f4c6064a5f9f7e4464070678b70f69cc1db2e7992da4c2fdd19c3c23a8daac77db2dfb166059cb84ea85cc21df4b4168fcea22ffc55c331ee9891b8dd
-Size (rustc-1.93.1-src.tar.gz) = 640951507 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) = a465dc5c8409202df63327a911b3482a0a00d166
-SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs) = 620eaf74c1dd030973af53dfe4f9aa998be5b123
-SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs) = 1a02f2dd61a5f9cc4be1f66ac3404c961810c731
-SHA1 (patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs) = 1862a68a0c835dd998267fd771a70574f0adab2e
-SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = 5380b0052dad5316663be76269cbac84830b6c97
-SHA1 (patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs) = 7deeb7d1d3306e96891dec144ac90398b88c6ad4
-SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee76da9bb768f5b3d9
-SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 8b18e1dbde59f3e8f20e93c7669618b2c7a13294
-SHA1 (patch-library_std_src_sys_fs_unix.rs) = c5eb48f177f6c1b50903fb6690177058851c526c
-SHA1 (patch-src_bootstrap_bootstrap.py) = fb89adaaf01f558d636734db5d778af4a3c67fd6
-SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
-SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = 00ceb941adbdd8fdb96f75dbcc50c2d2b3e55842
-SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = b7ce18d045c2ef250817ee4b6ed57e0524d99e71
-SHA1 (patch-src_bootstrap_src_core_sanity.rs) = deeb8a5d64e681f6be697f9e56073038a924c0d8
-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_m68k.rs) = 1e1b495b23362c79fbceb74797a18ea7038fe2e0
-SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 4a9ba4f47ae75318862f501160c25bb4ccf7dc7d
-SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = b2508d2e02883f69aba62e00490e2dd376ede2fd
-SHA1 (patch-vendor_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) = c3260bfdd670c31845189fcb6b4ed19385a03b2a
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf) = 49803c889864dbeccba92095b9fa6f104ff0180a
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c) = 895b5f4d80fb714973f6d6fb1a39d89907e4976d
-SHA1 (patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs) = 98e99556c19c055f696f0d9bfbce4aaf207b1640
-SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf) = cf8ea96ca5e47d8b236e7de9d766badcda7494aa
-SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c) = 3d3c52cad4faa7af77513eaab26b45ebfbcde906
-SHA1 (patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs) = 69420384e4716666011bd2c183aa1dc282f24d85
-SHA1 (patch-vendor_openssl-sys-0.9.107_build_find__normal.rs) = b3de2b9137882e3612291057c1b7793a27de760f
-SHA1 (patch-vendor_openssl-sys-0.9.107_build_main.rs) = 46627c013821166688d16d97f6f8ff4ccb552241
-SHA1 (patch-vendor_openssl-sys-0.9.109_build_find__normal.rs) = 96b7b6067e857ef1ef4c8b832dcbe13496e21ca4
-SHA1 (patch-vendor_openssl-sys-0.9.109_build_main.rs) = bc892cf8e13b6b8c6e30804fa41696bcedbabde3
-SHA1 (patch-vendor_openssl-sys-0.9.111_build_find__normal.rs) = 7548f8ef9ae7e1771035814398d72bec867e59a7
-SHA1 (patch-vendor_openssl-sys-0.9.111_build_main.rs) = 87e4f6c55eaf88ebbc81ff927991d013bfca5a38
-SHA1 (patch-vendor_openssl-sys-0.9.92_build_find__normal.rs) = 0ed143b603eea7c0bddf39e97916608c58978202
-SHA1 (patch-vendor_openssl-sys-0.9.92_build_main.rs) = 842ad74284518fbe8ff65222f7f6f81fb6381e49
-SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
-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
deleted file mode 100644
index d50f648b0a..0000000000
--- a/rust193/do-cross.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-# $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
-SHORT_TARGETS+= m68k
-
-# 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
-ROOT.m68k?= /u/m68k
-
-# 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
-G_TGT.m68k= m68k--netbsdelf
-
-# 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
-TGT.m68k= m68k-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
deleted file mode 100644
index 48cf4af822..0000000000
--- a/rust193/files/gcc-wrap
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /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"
- ;;
- m68k-*) # needed due to exceeding 16-bit offsets
- # ref.
- # relocation truncated to fit: R_68K_PC16 against ...
- madd="-mlong-jump-table-offsets"
- ;;
- esac
- # We build both for -8 and -9 due to ABI differences,
- # so can't just test $gnuarch... Yes, a vile hack.
- 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
deleted file mode 100644
index f9cdc04b0e..0000000000
--- a/rust193/options.mk
+++ /dev/null
@@ -1,116 +0,0 @@
-# $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>=20.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
deleted file mode 100644
index 8fd4710a16..0000000000
--- a/rust193/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-$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
deleted file mode 100644
index 74346dbe8e..0000000000
--- a/rust193/patches/patch-compiler_rustc__llvm_build.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-$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
deleted file mode 100644
index 90f4b467c7..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
deleted file mode 100644
index d30e2b6c6c..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 and NetBSD/m68k
-
---- compiler/rustc_target/src/spec/mod.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ compiler/rustc_target/src/spec/mod.rs
-@@ -1440,6 +1440,7 @@ supported_targets! {
- ("loongarch64-unknown-linux-musl", loongarch64_unknown_linux_musl),
- ("m68k-unknown-linux-gnu", m68k_unknown_linux_gnu),
- ("m68k-unknown-none-elf", m68k_unknown_none_elf),
-+ ("m68k-unknown-netbsd", m68k_unknown_netbsd),
- ("csky-unknown-linux-gnuabiv2", csky_unknown_linux_gnuabiv2),
- ("csky-unknown-linux-gnuabiv2hf", csky_unknown_linux_gnuabiv2hf),
- ("mips-unknown-linux-gnu", mips_unknown_linux_gnu),
-@@ -1529,6 +1530,7 @@ supported_targets! {
- ("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
- ("i586-unknown-netbsd", i586_unknown_netbsd),
- ("i686-unknown-netbsd", i686_unknown_netbsd),
-+ ("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
deleted file mode 100644
index 64f75d7aa0..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-$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
deleted file mode 100644
index 870b6f0931..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-$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_m68k__unknown__netbsd.rs b/rust193/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
deleted file mode 100644
index 8ade8f5369..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_m68k__unknown__netbsd.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-Add a target description for NetBSD/m68k.
-
---- /dev/null 2026-02-24 21:43:45.067063051 +0000
-+++ compiler/rustc_target/src/spec/targets/m68k_unknown_netbsd.rs 2026-02-24 21:48:57.106967890 +0000
-@@ -0,0 +1,31 @@
-+use rustc_abi::Endian;
-+
-+use crate::spec::{Arch, LinkSelfContainedDefault, Target, TargetMetadata, TargetOptions, base};
-+
-+pub(crate) fn target() -> Target {
-+ let mut base = base::netbsd::opts();
-+ base.cpu = "M68020".into();
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "m68k-unknown-netbsd".into(),
-+ metadata: TargetMetadata {
-+ description: Some("Motorola 680x0 NetBSD".into()),
-+ tier: Some(3),
-+ host_tools: Some(false),
-+ std: Some(true),
-+ },
-+ pointer_width: 32,
-+ data_layout: "E-m:e-p:32:16:32-i8:8:8-i16:16:16-i32:16:32-n8:16:32-a:0:16-S16".into(),
-+ arch: Arch::M68k,
-+ options: TargetOptions {
-+ endian: Endian::Big,
-+ mcount: "_mcount".into(),
-+
-+ // LLD currently does not have support for M68k
-+ link_self_contained: LinkSelfContainedDefault::False,
-+ ..base
-+ },
-+ }
-+}
-+
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
deleted file mode 100644
index 18383b7a1d..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-$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
deleted file mode 100644
index 9f9b89dbe0..0000000000
--- a/rust193/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 9084324dd8..0000000000
--- a/rust193/patches/patch-library_backtrace_src_symbolize_gimli.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index f49e07d14f..0000000000
--- a/rust193/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-$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
deleted file mode 100644
index d5ff1277c8..0000000000
--- a/rust193/patches/patch-library_std_src_sys_fs_unix.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-$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
deleted file mode 100644
index 5ef63731ca..0000000000
--- a/rust193/patches/patch-src_bootstrap_bootstrap.py
+++ /dev/null
@@ -1,48 +0,0 @@
-$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
deleted file mode 100644
index 92eee78647..0000000000
--- a/rust193/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 3e456035c5..0000000000
--- a/rust193/patches/patch-src_bootstrap_src_core_build__steps_install.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 0580e7f16a..0000000000
--- a/rust193/patches/patch-src_bootstrap_src_core_builder_cargo.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-$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_core_sanity.rs b/rust193/patches/patch-src_bootstrap_src_core_sanity.rs
deleted file mode 100644
index 0d1fda0475..0000000000
--- a/rust193/patches/patch-src_bootstrap_src_core_sanity.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Temporarily add m68k-unknown-netbsd to STAGE0_MISSING_TARGETS.
-...while we bootstrap the target.
-
---- src/bootstrap/src/core/sanity.rs.orig 2026-02-24 22:45:56.679440377 +0000
-+++ src/bootstrap/src/core/sanity.rs
-@@ -42,6 +42,7 @@ const STAGE0_MISSING_TARGETS: &[&str] =
- // just a dummy comment so the list doesn't get onelined
- "riscv64gc-unknown-redox",
- "hexagon-unknown-qurt",
-+ "m68k-unknown-netbsd",
- ];
-
- /// Minimum version threshold for libstdc++ required when using prebuilt LLVM
diff --git a/rust193/patches/patch-src_bootstrap_src_lib.rs b/rust193/patches/patch-src_bootstrap_src_lib.rs
deleted file mode 100644
index 9f8eabe566..0000000000
--- a/rust193/patches/patch-src_bootstrap_src_lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-$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
deleted file mode 100644
index c175e399cb..0000000000
--- a/rust193/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 6a701cd3aa..0000000000
--- a/rust193/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-$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
deleted file mode 100644
index 8722fdfe38..0000000000
--- a/rust193/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-$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
deleted file mode 100644
index 7ddeba50e3..0000000000
--- a/rust193/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index e255aa5af9..0000000000
--- a/rust193/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 0d2e97d952..0000000000
--- a/rust193/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-$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
deleted file mode 100644
index faee0c00f9..0000000000
--- a/rust193/patches/patch-src_tools_cargo_tests_testsuite_build.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-$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
deleted file mode 100644
index a534c9698e..0000000000
--- a/rust193/patches/patch-src_tools_rust-installer_install-template.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-$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
deleted file mode 100644
index b435eaa191..0000000000
--- a/rust193/patches/patch-tests_assembly-llvm_targets_targets-elf.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 8a7b3793fa..0000000000
--- a/rust193/patches/patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 1b6c7088be..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index ee6548b217..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 2127d0f1bc..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 003128b639..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-$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
deleted file mode 100644
index 6af8f1a783..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.168_src_unix_solarish_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 67b812ae9b..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index a44e84040e..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-$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
deleted file mode 100644
index a1339953f1..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.169_src_unix_solarish_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index fdf24dce61..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-$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
deleted file mode 100644
index 44401fa70e..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-$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
deleted file mode 100644
index 224b4e930b..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index bb3c8b5c52..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-$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
deleted file mode 100644
index 4b32e88f6d..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index a0eb64778f..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-$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_m68k.rs b/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
deleted file mode 100644
index e7f19ecf34..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_m68k.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Add cpu-specific file for m68k on NetBSD.
-
---- /dev/null 2026-02-25 04:15:52.295235767 +0000
-+++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/m68k.rs 2026-02-25 10:17:54.356620620 +0000
-@@ -0,0 +1,10 @@
-+use crate::prelude::*;
-+use crate::PT_FIRSTMACH;
-+
-+pub type __cpu_simple_lock_nv_t = u8;
-+
-+pub(crate) const _ALIGNBYTES: usize = size_of::<c_int>() - 1;
-+
-+pub const PT_STEP: c_int = PT_FIRSTMACH + 0;
-+pub const PT_GETREGS: c_int = PT_FIRSTMACH + 1;
-+pub const PT_SETREGS: c_int = PT_FIRSTMACH + 2;
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
deleted file mode 100644
index 51b50ed4eb..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
-isn't universally this type on the various NetBSD targets.
-
-Also add m68k target.
-
---- vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -15,7 +15,7 @@ pub type lwpid_t = c_uint;
- pub type shmatt_t = c_uint;
- pub type cpuid_t = c_ulong;
- pub type cpuset_t = _cpuset;
--pub type pthread_spin_t = c_uchar;
-+pub type pthread_spin_t = __pthread_spin_t;
- pub type timer_t = c_int;
-
- // elf.h
-@@ -3001,6 +3001,9 @@ cfg_if! {
- } else if #[cfg(target_arch = "riscv64")] {
- mod riscv64;
- pub use self::riscv64::*;
-+ } else if #[cfg(target_arch = "m68k")] {
-+ mod m68k;
-+ pub use self::m68k::*;
- } else {
- // Unknown target_arch
- }
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
deleted file mode 100644
index 05c0d14ca1..0000000000
--- a/rust193/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-$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
deleted file mode 100644
index 4d14411866..0000000000
--- a/rust193/patches/patch-vendor_line-index-0.1.2_src_lib.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-$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
deleted file mode 100644
index 6eaa429abe..0000000000
--- a/rust193/patches/patch-vendor_lzma-sys-0.1.20_config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index 06fbbc1f87..0000000000
--- a/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index 3fa3ec8c4d..0000000000
--- a/rust193/patches/patch-vendor_memchr-2.7.4_src_arch_aarch64_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index da85596fc1..0000000000
--- a/rust193/patches/patch-vendor_memchr-2.7.4_src_memchr.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-$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
deleted file mode 100644
index 743d4886ee..0000000000
--- a/rust193/patches/patch-vendor_memchr-2.7.4_src_memmem_searcher.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-$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
deleted file mode 100644
index 6851a4a4fd..0000000000
--- a/rust193/patches/patch-vendor_memchr-2.7.4_src_vector.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 8a3b7874ae..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_Configurations_10-main.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index be229e5788..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_openssl_crypto_aria_aria.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index f7abd5d7d0..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-111.28.2+1.1.1w_src_lib.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD$
-
-Add the various NetBSD targets.
-
---- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
-@@ -239,6 +239,8 @@ impl Build {
- "aarch64-unknown-freebsd" => "BSD-generic64",
- "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,8 +269,10 @@ impl Build {
- "i686-unknown-freebsd" => "BSD-x86-elf",
- "i686-unknown-linux-gnu" => "linux-elf",
- "i686-unknown-linux-musl" => "linux-elf",
-+ "i686-unknown-netbsd" => "BSD-x86-elf",
- "loongarch64-unknown-linux-gnu" => "linux-generic64",
- "loongarch64-unknown-linux-musl" => "linux-generic64",
-+ "m68k-unknown-netbsd" => NetBSD-generic32,
- "mips-unknown-linux-gnu" => "linux-mips32",
- "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -274,9 +281,11 @@ impl Build {
- "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "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 +293,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
deleted file mode 100644
index 788a38e3d8..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_Configurations_10-main.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 34a78253e2..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_openssl_crypto_aria_aria.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 3851054519..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-300.5.0+3.5.0_src_lib.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Make this build on NetBSD for arm6, mipsel and m68k as well.
-
---- vendor/openssl-src-300.5.0+3.5.0/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/openssl-src-300.5.0+3.5.0/src/lib.rs
-@@ -321,6 +321,7 @@ impl Build {
- "armv5te-unknown-linux-gnueabi" => "linux-armv4",
- "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",
-@@ -348,6 +349,7 @@ impl Build {
- "i686-uwp-windows-msvc" => "VC-WIN32-UWP",
- "loongarch64-unknown-linux-gnu" => "linux-generic64",
- "loongarch64-unknown-linux-musl" => "linux-generic64",
-+ "m68k-unknown-netbsd" => "NetBSD-generic32",
- "mips-unknown-linux-gnu" => "linux-mips32",
- "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -356,6 +358,7 @@ impl Build {
- "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "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
deleted file mode 100644
index c826efe847..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_Configurations_10-main.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 5f134efcf4..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 2a9ec06917..0000000000
--- a/rust193/patches/patch-vendor_openssl-src-300.5.4+3.5.4_src_lib.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Make this build on NetBSD for armv6, mipsel and m68k as well.
-
---- vendor/openssl-src-300.5.4+3.5.4/src/lib.rs.orig 2026-02-11 07:30:54.000000000 +0000
-+++ vendor/openssl-src-300.5.4+3.5.4/src/lib.rs
-@@ -326,6 +326,7 @@ impl Build {
- "armv5te-unknown-linux-gnueabi" => "linux-armv4",
- "armv5te-unknown-linux-musleabi" => "linux-armv4",
- "armv6-unknown-freebsd" => "BSD-generic32",
-+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
- "armv6-alpine-linux-musleabihf" => "linux-armv6",
- "armv7-unknown-freebsd" => "BSD-armv4",
- "armv7-unknown-linux-gnueabi" => "linux-armv4",
-@@ -353,6 +354,7 @@ impl Build {
- "i686-uwp-windows-msvc" => "VC-WIN32-UWP",
- "loongarch64-unknown-linux-gnu" => "linux-generic64",
- "loongarch64-unknown-linux-musl" => "linux-generic64",
-+ "m68k-unknown-netbsd" => "NetBSD-generic32",
- "mips-unknown-linux-gnu" => "linux-mips32",
- "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -361,6 +363,7 @@ impl Build {
- "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "mipsel-unknown-netbsd" => "NetBSD-generic32",
- "powerpc-unknown-freebsd" => "BSD-ppc",
- "powerpc-unknown-linux-gnu" => "linux-ppc",
- "powerpc-unknown-linux-gnuspe" => "linux-ppc",
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
deleted file mode 100644
index 3f499547d4..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
deleted file mode 100644
index 7e665d8853..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.107_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
deleted file mode 100644
index 31a115a1cc..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
deleted file mode 100644
index 4a6098ad57..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.109_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$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.111_build_find__normal.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
deleted file mode 100644
index 96a2d0e1ba..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.111_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Add hack for Darwin when homebrew is installed.
-
---- vendor/openssl-sys-0.9.111/build/find_normal.rs.orig 2026-01-25 08:56:08.257782732 +0000
-+++ vendor/openssl-sys-0.9.111/build/find_normal.rs
-@@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
- fn find_openssl_dir(target: &str) -> OsString {
- let host = env::var("HOST").unwrap();
-
-- if host == target && target.ends_with("-apple-darwin") {
-- let homebrew_dir = match target {
-- "aarch64-apple-darwin" => "/opt/homebrew",
-- _ => "/usr/local",
-- };
--
-- if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
-- // pkgsrc
-- return dir.into();
-- } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
-- // MacPorts
-- return dir.into();
-- }
-- }
--
- try_pkg_config();
- try_vcpkg();
-
diff --git a/rust193/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs b/rust193/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
deleted file mode 100644
index fa70956e3f..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.111_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$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.111/build/main.rs.orig 2026-01-25 08:57:28.677889187 +0000
-+++ vendor/openssl-sys-0.9.111/build/main.rs
-@@ -279,6 +279,14 @@ fn main() {
- println!("cargo:rustc-link-lib=atomic");
- }
-
-+ // Patterned of the above, make sure we include -latomic
-+ // on ilp32 ports (yes, this only tests the "p32" part).
-+ if env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
-+ && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
-+ {
-+ println!("cargo:rustc-link-lib=atomic");
-+ }
-+
- if kind == "static" && target.contains("windows") {
- println!("cargo:rustc-link-lib=dylib=gdi32");
- println!("cargo:rustc-link-lib=dylib=user32");
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
deleted file mode 100644
index fd7def4861..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_find__normal.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
deleted file mode 100644
index b7131a38fe..0000000000
--- a/rust193/patches/patch-vendor_openssl-sys-0.9.92_build_main.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
deleted file mode 100644
index 6c90dec84c..0000000000
--- a/rust193/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-$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
deleted file mode 100644
index 35ab52f6cb..0000000000
--- a/rust193/patches/patch-vendor_zerocopy-0.7.32_src_lib.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index d71d7d0924..0000000000
--- a/rust193/patches/patch-vendor_zerocopy-0.7.35_src_lib.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index 990d660c45..0000000000
--- a/rust193/patches/patch-vendor_zeroize-1.8.1_src_lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index ef0d07388c..0000000000
--- a/rust193/platform.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $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
deleted file mode 100644
index d8a478987f..0000000000
--- a/rust193/rust.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $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.85.0
-#
-# 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.85.0
-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