rust: Update to 1.63.0 and cleanup.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rust: Update to 1.63.0 and cleanup.
From: Jonathan Perkin <jonathan%perkin.org.uk@localhost>
Date: Thu, 01 Sep 2022 09:41:45 +0000
Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jonathan%perkin.org.uk@localhost>
Pushed By:	jperkin
Date:		Thu Sep 1 10:41:45 2022 +0100
Changeset:	f7b1b623bf3f0b480611e28117528b68d901a306

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/do-cross.mk
	rust/options.mk
	rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
Removed Files:
	rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs

Log Message:
rust: Update to 1.63.0 and cleanup.

pkgsrc changes:
  * Fix a syntax error in options.mk
  * Lots of pkglint cleanup

Version 1.63.0 (2022-08-11)
==========================

Language
--------
- [Remove migrate borrowck mode for pre-NLL errors.][95565]
- [Modify MIR building to drop repeat expressions with length zero.][95953]
- [Remove label/lifetime shadowing warnings.][96296]
- [Allow explicit generic arguments in the presence of `impl Trait` args.][96868]
- [Make `cenum_impl_drop_cast` warnings deny-by-default.][97652]
- [Prevent unwinding when `-C panic=abort` is used regardless of declared ABI.][96959]
- [lub: don't bail out due to empty binders.][97867]

Compiler
--------
- [Stabilize the `bundle` native library modifier,][95818] also removing the
  deprecated `static-nobundle` linking kind.
- [Add Apple WatchOS compile targets*.][95243]
- [Add a Windows application manifest to rustc-main.][96737]

* Refer to Rust's [platform support page][platform-support-doc] for more
   information on Rust's tiered platform support.

Libraries
---------
- [Implement `Copy`, `Clone`, `PartialEq` and `Eq` for `core::fmt::Alignment`.][94530]
- [Extend `ptr::null` and `null_mut` to all thin (including extern) types.][94954]
- [`impl Read and Write for VecDeque<u8>`.][95632]
- [STD support for the Nintendo 3DS.][95897]
- [Make write/print macros eagerly drop temporaries.][96455]
- [Implement internal traits that enable `[OsStr]::join`.][96881]
- [Implement `Hash` for `core::alloc::Layout`.][97034]
- [Add capacity documentation for `OsString`.][97202]
- [Put a bound on collection misbehavior.][97316]
- [Make `std::mem::needs_drop` accept `?Sized`.][97675]
- [`impl Termination for Infallible` and then make the `Result` impls of `Termination` more generic.][97803]
- [Document Rust's stance on `/proc/self/mem`.][97837]

Stabilized APIs
---------------

- [`array::from_fn`]
- [`Box::into_pin`]
- [`BinaryHeap::try_reserve`]
- [`BinaryHeap::try_reserve_exact`]
- [`OsString::try_reserve`]
- [`OsString::try_reserve_exact`]
- [`PathBuf::try_reserve`]
- [`PathBuf::try_reserve_exact`]
- [`Path::try_exists`]
- [`Ref::filter_map`]
- [`RefMut::filter_map`]
- [`NonNull::<[T]>::len`][`NonNull::<slice>::len`]
- [`ToOwned::clone_into`]
- [`Ipv6Addr::to_ipv4_mapped`]
- [`unix::io::AsFd`]
- [`unix::io::BorrowedFd<'fd>`]
- [`unix::io::OwnedFd`]
- [`windows::io::AsHandle`]
- [`windows::io::BorrowedHandle<'handle>`]
- [`windows::io::OwnedHandle`]
- [`windows::io::HandleOrInvalid`]
- [`windows::io::HandleOrNull`]
- [`windows::io::InvalidHandleError`]
- [`windows::io::NullHandleError`]
- [`windows::io::AsSocket`]
- [`windows::io::BorrowedSocket<'handle>`]
- [`windows::io::OwnedSocket`]
- [`thread::scope`]
- [`thread::Scope`]
- [`thread::ScopedJoinHandle`]

These APIs are now usable in const contexts:

- [`array::from_ref`]
- [`slice::from_ref`]
- [`intrinsics::copy`]
- [`intrinsics::copy_nonoverlapping`]
- [`<*const T>::copy_to`]
- [`<*const T>::copy_to_nonoverlapping`]
- [`<*mut T>::copy_to`]
- [`<*mut T>::copy_to_nonoverlapping`]
- [`<*mut T>::copy_from`]
- [`<*mut T>::copy_from_nonoverlapping`]
- [`str::from_utf8`]
- [`Utf8Error::error_len`]
- [`Utf8Error::valid_up_to`]
- [`Condvar::new`]
- [`Mutex::new`]
- [`RwLock::new`]

Cargo
-----
- [Stabilize the `--config path` command-line argument.][cargo/10755]
- [Expose rust-version in the environment as `CARGO_PKG_RUST_VERSION`.][cargo/10713]

Compatibility Notes
-------------------

- [`#[link]` attributes are now checked more strictly,][96885] which may introduce
  errors for invalid attribute arguments that were previously ignored.

Internal Changes
----------------

These changes provide no direct user facing benefits, but represent significant
improvements to the internals and overall performance of rustc
and related tools.

- [Prepare Rust for LLVM opaque pointers.][94214]

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f7b1b623bf3f0b480611e28117528b68d901a306

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/Makefile                                      | 115 ++++++------
 rust/distinfo                                      | 207 ++++++++++-----------
 rust/do-cross.mk                                   |  52 +++---
 rust/options.mk                                    |   2 +-
 ...c-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs |   5 +-
 ...c-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs |  29 ---
 6 files changed, 190 insertions(+), 220 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 84ec50d74f..60c12986eb 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.197 2020/09/29 16:45:16 gdt Exp $
 
-DISTNAME=	rustc-1.62.1-src
+DISTNAME=	rustc-1.63.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
@@ -28,29 +28,29 @@ BROKEN_ON_PLATFORM+=	NetBSD-8.*-*arm*
 BROKEN_ON_PLATFORM+=	NetBSD-8.*-aarch64
 BROKEN_ON_PLATFORM+=	NetBSD-8.*-sparc64
 
-HAS_CONFIGURE=			yes
-PYTHON_FOR_BUILD_ONLY=		yes
-CONFIG_SHELL=			${PYTHONBIN}
-CONFIGURE_SCRIPT=		src/bootstrap/configure.py
-CONFIGURE_ARGS+=		--prefix=${PREFIX}
-CONFIGURE_ARGS+=		--mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=		--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=		--python=${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
+HAS_CONFIGURE=		yes
+PYTHON_FOR_BUILD_ONLY=	yes
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	src/bootstrap/configure.py
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--python=${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
 
 # Include (optional) settings to cross-build rust
 .include "cross.mk"
 
 # optional from do-cross.mk
-CONFIGURE_ARGS+=		${ADD_CONFIGURE_ARGS}
+CONFIGURE_ARGS+=	${ADD_CONFIGURE_ARGS}
 
 # Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
 # uncommenting the LD_LIBRARY_PATH setting may be required to run
@@ -186,49 +186,49 @@ BUILDLINK_TRANSFORM+=	opt:x86_64:arm64
 DISTFILES:=		${DEFAULT_DISTFILES}
 
 .if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		aarch64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		x86_64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		aarch64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		arm-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		armv7-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		i686-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		x86_64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -240,7 +240,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 # x86_64-sun-solaris bootstrap and comment out the overrides.
 #
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.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/
@@ -253,14 +253,14 @@ CONFIGURE_ARGS+=	--host=${RUST_ARCH}
 CONFIGURE_ARGS+=	--target=${RUST_ARCH}
 .endif
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH:=		x86_64-unknown-freebsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH=		i586-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -280,14 +280,14 @@ pre-build-fix-paxctl:
 	${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.0
+RUST_STAGE0_VER=	1.62.1
 RUST_ARCH=		powerpc-unknown-netbsd
 
 # Cross-built against NetBSD 9.0
@@ -310,39 +310,39 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.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/}
+RUST_STAGE0_VER=		1.62.1
+RUST_ARCH=			aarch64-unknown-netbsd
+RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.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/}
+RUST_STAGE0_VER=		1.62.1
+RUST_ARCH=			aarch64_be-unknown-netbsd
+RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.61.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/}
+RUST_STAGE0_VER=		1.62.1
+RUST_ARCH=			sparc64-unknown-netbsd
+RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_ARCH=		armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER=	1.61.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/}
+RUST_ARCH=			armv7-unknown-netbsd-eabihf
+RUST_STAGE0_VER=		1.62.1
+RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 
@@ -384,9 +384,10 @@ CKSUMS+=	dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
 CKSUM_CRATES+=	vendor/libc
 CKSUMS+=	8826303cad14a575fa8189f67c7df52a7e11f8eea0381d7d389ff8206757de9e
 CKSUMS+=	f79ec5ad2156182d51cf70d80401293da6f8277983dbdedfd2e6927133440e42
-#CKSUM_CRATES+=	vendor/libc
 CKSUMS+=	976b07a13e195840b67c166a62318abfa9ffc8d5ebbb0358f199dd213ec98d1b
 CKSUMS+=	ee760c856bb491d885e9458fb723c53db7988ba775e59ab5b9ee8be438e69cf4
+CKSUMS+=	cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55
+CKSUMS+=	683f56837b31b9f0f5bace3080c5242b86f57f71d1126e352be24af9874ab531
 
 CKSUM_CRATES+=	vendor/lzma-sys
 CKSUMS+=	6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -544,7 +545,7 @@ stage0-bootstrap: install
 		${CP} `${PKG_CC} -print-file-name=$${lib}` \
 		    ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
 	done; \
-	for lib in libLLVM-13.so libcrypto.so.1.1 libcurl.so.4 \
+	for lib in libLLVM-14.so libcrypto.so.1.1 libcurl.so.4 \
 		   libssl.so.1.1 libz.so.1; do \
 		${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
 	done; \
diff --git a/rust/distinfo b/rust/distinfo
index f298fd034f..7e60119692 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -1,107 +1,107 @@
 $NetBSD: distinfo,v 1.118 2020/08/06 11:42:56 jperkin Exp $
 
-BLAKE2s (rust-1.61.0-aarch64-apple-darwin.tar.gz) = 302f636b2e73cdd5233e520bdfec0a2071d7c0c3c299780e2de75e727024fb38
-SHA512 (rust-1.61.0-aarch64-apple-darwin.tar.gz) = 248c5d1c3b440aa1ebb8d8d519651259566407f3efd0c33724d274a4f85a371c1b3ead79be24bf38cbca8b57740cb017b26634a4c34c1f3c605d28a8d181a8af
-Size (rust-1.61.0-aarch64-apple-darwin.tar.gz) = 223157966 bytes
-BLAKE2s (rust-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 033b7a591e7880665e6b0aa0970ef6cc82788ffdaf4ffb557afbbb7b1ff2cf05
-SHA512 (rust-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = e655efc0442872df855d3593c5b8b5c91037682cfcdfe5f3fc62f23c08ffe52d035bea94d9418d99f279da6835bbe4b17b92038c7c8b61dfa16a8d419e43c0ea
-Size (rust-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 384662543 bytes
-BLAKE2s (rust-1.61.0-aarch64-unknown-netbsd.tar.xz) = 1ce2a2f0feccc3be8dc3084e44a75d98a5277c4f8ef7c06503f1077110c95733
-SHA512 (rust-1.61.0-aarch64-unknown-netbsd.tar.xz) = c1ce3dd379ad469752bb4d44008f65cb4aacf5c06bc4ebe148bf43904de46e12beff404044e09d93c511172de2bd178fe050dda0b6abf56031188e8d0c290344
-Size (rust-1.61.0-aarch64-unknown-netbsd.tar.xz) = 152425036 bytes
-BLAKE2s (rust-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = ee8093109204823679d484928c010f6313b27ec6e787f0d960e84cf96f132109
-SHA512 (rust-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = f8b5a58a94ac9313a8c8445ba8a8d94dfa9fbfee21f3273d0d705f30ecec4eeeb0325723a73381fa2ea32ced419f09279f1233c174f749aa4ada93ec6810cabf
-Size (rust-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = 153824936 bytes
-BLAKE2s (rust-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 3ad009c7620aacb0d3d4e6a43d87cd8b2fdb7643955ebceef5111ba867bbc52b
-SHA512 (rust-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 74ada02f436b2a97e05c8ec5bb8f7c0b638c5a59a71f04ba274efa6016a10514477480bce4e3023fe5586ab3190bdc270db723787d4d8ffccbaf0ba995325c1d
-Size (rust-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 313941585 bytes
-BLAKE2s (rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 3a66ca94537a649efdcf4f87a26941717bbabf4da56edd330c6d0e1a5423e55f
-SHA512 (rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 951e49690023a681215f0911937af84642dda2e5be5261629eda6662f50fdd8fea0cfb20d8067cd39b6eea51cc0e5fe7e0ab337c8c379d7408b1669816754c4d
-Size (rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 305528469 bytes
-BLAKE2s (rust-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = fcfc58215e88b6a4d37994362def451a4d2b53aa1e941224a12d523d947d8fcf
-SHA512 (rust-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 5f14d9489a472aa743a49870f561ff7f99d92eac9db4e56f4909a38710e4e7e496b48387392afc9e4dd0d29efb971d7c893a38108791bb29127f15bfb6af5e24
-Size (rust-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 131446548 bytes
-BLAKE2s (rust-1.61.0-i586-unknown-netbsd.tar.xz) = 5b3fff5a7a53ca37dfc4ada3fefc2d494a60d7df785275b4b745be867ef4ad34
-SHA512 (rust-1.61.0-i586-unknown-netbsd.tar.xz) = 26d8d732d807ee62208db05c37e68dfe3f43924e0e4a57f02f86442e49f1660d736d74c218301af00a94fe62d35ea4a2eb2056c996387d6fc369cd2f4804a59b
-Size (rust-1.61.0-i586-unknown-netbsd.tar.xz) = 164105180 bytes
-BLAKE2s (rust-1.61.0-i686-unknown-linux-gnu.tar.gz) = b3d33a7243bed8546e1f233bb936970bfb4a1485902307430f479f5a9fb98dc2
-SHA512 (rust-1.61.0-i686-unknown-linux-gnu.tar.gz) = d2e7365ddc08e04de94a3aa1eb0388001e574d1a768e5506d88c6a637ebae54bcf6cf1790b08243bfdf439088c5fbaf1e8979cb2c80b699d47802149a7d26d76
-Size (rust-1.61.0-i686-unknown-linux-gnu.tar.gz) = 359348717 bytes
-BLAKE2s (rust-1.61.0-powerpc-unknown-netbsd.tar.xz) = 6d90142d69fd475a45713b7a1e9ea63465537d854e3b498baf5285eb87d60662
-SHA512 (rust-1.61.0-powerpc-unknown-netbsd.tar.xz) = b6e082decdcb28f4bb1c078ea48717c4ad3ef20d7cfecbc768df23e33b757515a266ad3146633a20befaf2da9ac443e1dd1ed69867513c1ce324e097808da9b5
-Size (rust-1.61.0-powerpc-unknown-netbsd.tar.xz) = 171267280 bytes
-BLAKE2s (rust-1.61.0-powerpc-unknown-netbsd90.tar.xz) = fae7b4b7c7aa5b82c3baa01534a430864e30d5338ddbf94dc3926d775feb0930
-SHA512 (rust-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 5a4a10690155fe743536ff6490df7edb2dea3ba3be556bc2e3d9f903c66db58dd8f8d1430d9cfa067797db0006ddfb4191ade74109cbec74fa16a742d0f4d37c
-Size (rust-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 173506228 bytes
-BLAKE2s (rust-1.61.0-sparc64-unknown-netbsd.tar.xz) = a30a9e02b087c374f54a2505aa70e62888070d7f0f1633cde5b0303a1099928a
-SHA512 (rust-1.61.0-sparc64-unknown-netbsd.tar.xz) = 0c08758d93b3d20fd9694e0a1e74d0db8a1065d362610b05e25cd6d4b2a5f5ceb6453fde8e03b90b328fdc1508cb385fd2331df89e8762f24d4b0dc56e34920d
-Size (rust-1.61.0-sparc64-unknown-netbsd.tar.xz) = 148653524 bytes
-BLAKE2s (rust-1.61.0-x86_64-apple-darwin.tar.gz) = 586f09f54f6bfa48bca1362e0aff4a77577de51c9ec7ba40039f21bbe6fe0f9d
-SHA512 (rust-1.61.0-x86_64-apple-darwin.tar.gz) = f585487ad238ee3a8d9268f5bcd76019da67de96ebd5a84d3b5f809ad6f3cd2ae79c7d93d8d2affbbf4bdfa61ab577a34a885196fe09408a658a577d20a892b2
-Size (rust-1.61.0-x86_64-apple-darwin.tar.gz) = 294924562 bytes
-BLAKE2s (rust-1.61.0-x86_64-unknown-freebsd.tar.gz) = b45e3011ce13ceeebac6eb179042c04da61713daaee1d01f3006f4c1563a974d
-SHA512 (rust-1.61.0-x86_64-unknown-freebsd.tar.gz) = da30babf3a6dba8af0cfdf5f131206360219af1b598568f6cbb55680e74e4d7a38ff14166e69daa4b8c16d7d9d9e2866511b9c20090b8e136b275ecb8c5a0133
-Size (rust-1.61.0-x86_64-unknown-freebsd.tar.gz) = 279844072 bytes
-BLAKE2s (rust-1.61.0-x86_64-unknown-illumos.tar.gz) = 3f6b3720e1d1643a832c9e576e9338b39236243965e245978a0fbc585cadf6cf
-SHA512 (rust-1.61.0-x86_64-unknown-illumos.tar.gz) = 31b38f6adc164e2f1873af31899a32180c93c0fb0881557c19ec688b952e85dfc9e2c4b8543aae642f13f77ebad98c0d9e14b206b32b3f54504d495ba801b3e5
-Size (rust-1.61.0-x86_64-unknown-illumos.tar.gz) = 196885675 bytes
-BLAKE2s (rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 5f3564c314d3622d64a590267706097d1cb9704c252638f07aa239c1fcf48256
-SHA512 (rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 7352d98d3acfe8bd754641381435d4bcb3399a8448fe6883b7c96ee41ffa380d8545cc8471ca4b21ee29c0d8e891e28de3ab91e985ad16b88965342358a87590
-Size (rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 267765196 bytes
-BLAKE2s (rust-1.61.0-x86_64-unknown-netbsd.tar.xz) = 286cc36270967561d44dd469ecb03fe8356e76fc1d44beb1b2ad92644149a483
-SHA512 (rust-1.61.0-x86_64-unknown-netbsd.tar.xz) = ada2acd0f34c45e689ae97d98fa3cfbcbdb330b9231178c1b3e91c0474af47a84a3ae893309aed1fb14b726e2b07894713520fedebc2b534b16cd559d276cf43
-Size (rust-1.61.0-x86_64-unknown-netbsd.tar.xz) = 168759980 bytes
-BLAKE2s (rust-std-1.61.0-aarch64-apple-darwin.tar.gz) = 1a6ce39d1b191696803a8e4190992217cf0c77133cd4a59f0b3fdcaa99a1ee17
-SHA512 (rust-std-1.61.0-aarch64-apple-darwin.tar.gz) = b5d613d9484ed7d505e62bd905f573565b691a11e61416b78b6f0dcd0e7bf8528b608ae8ae65a0523aa1b85d755e725399a3a250a7c5a7cd015a5d364bce5348
-Size (rust-std-1.61.0-aarch64-apple-darwin.tar.gz) = 40372015 bytes
-BLAKE2s (rust-std-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = eb33ffa3c0de6a95d7de177ba08a9220d42203adc8906a2634fd6edc8c54b36c
-SHA512 (rust-std-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 574984228b3f39e43bc751a01593e8831e5f1b9c87a79f2b5870ee356206bf14572169f91bbf73a76081eea100bde73dd4a4bf176dcbf882394c7ef46d1f2aea
-Size (rust-std-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 57803910 bytes
-BLAKE2s (rust-std-1.61.0-aarch64-unknown-netbsd.tar.xz) = f32b0fa6188491cb80578d780a8d56461b9a5c8fa5a237950a80399f7e02d799
-SHA512 (rust-std-1.61.0-aarch64-unknown-netbsd.tar.xz) = 65962e7a5752645cb1e51b3338ddd358d5575faf74cf5869c12d5593e0daa9f898442d11ffde198873bc1eeb707f47c49aa90b1444d15e00dd1712698998d7f5
-Size (rust-std-1.61.0-aarch64-unknown-netbsd.tar.xz) = 23632144 bytes
-BLAKE2s (rust-std-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = b209b1bb802c4631c1b62121045ca86b4144bf4a778bb102587cce8535ebea38
-SHA512 (rust-std-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = e63ea551dd707882dd5a9db380a6d125bd36394c97833b47e840d5ee446b6acbb8b029881fd8ab74153ee3da042a995ebe7b708b0951b657ca6654d2915d20a3
-Size (rust-std-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = 23334820 bytes
-BLAKE2s (rust-std-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = ab3d1591f25a7f39e9c1b0bb16506dea2ef31a5020b63cb11055d8b1c17520c5
-SHA512 (rust-std-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = d3d834a55107bed04ef71479db9d10a0e895422874d754ba8f36f0633291d395d9e869f9de9160df619f5102b29434a4c2a464a5a40d8845f9aec77bc25992cc
-Size (rust-std-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 36343974 bytes
-BLAKE2s (rust-std-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 8b46d14aa8a2bdcd0f5df8d324edc12bea56abf72ca5f3626302b164823790c8
-SHA512 (rust-std-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = d92eb00c53ed725c55aaa2addb1c9e9ea92c8c07d2305e7565c960a3c670a17239df17b7942f5d8f8ddd5d3fcf95c4a9051366f4abf0b5ad0908ff163f46fb6e
-Size (rust-std-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 38251240 bytes
-BLAKE2s (rust-std-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 21d2975a4d1cb48bab85cdc96da017895ba17cd10828ad941803a06cbd451cf8
-SHA512 (rust-std-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 96a21ba042e7313f94244f56e8b946b9f69ace8126770b9aec591755f7ea49553af28d00efc84d9eed214801c615394c0668ff1963090905ca8a98d2358a991a
-Size (rust-std-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 22710204 bytes
-BLAKE2s (rust-std-1.61.0-i586-unknown-netbsd.tar.xz) = 6e243ba70f0855a331e245d737989bf130058a9c5174448a0d1ce2b2c4b7d448
-SHA512 (rust-std-1.61.0-i586-unknown-netbsd.tar.xz) = ff746760d086bfb0b77932aa8167cebc2ecc0b6a35e3174ba2019b431f21bd8ca278f3a74f3f080b555d775add4d0b2604e12f7381cc7bf11717b24b82563ca9
-Size (rust-std-1.61.0-i586-unknown-netbsd.tar.xz) = 23293816 bytes
-BLAKE2s (rust-std-1.61.0-i686-unknown-linux-gnu.tar.gz) = 61440054014a811b7423c0eccd3cd9fd71c1dfff11dd959a530ed26856f6ea04
-SHA512 (rust-std-1.61.0-i686-unknown-linux-gnu.tar.gz) = c4140820a64b5079c156b7125fc0127b8b6c23b6e2a7fa4b8fb1935a2041d1248ca8c07acd14091bb0b7ef25012c256a951f906da34389df0fb8e5cbd8e71978
-Size (rust-std-1.61.0-i686-unknown-linux-gnu.tar.gz) = 40230974 bytes
-BLAKE2s (rust-std-1.61.0-powerpc-unknown-netbsd.tar.xz) = 089b76e138ffdc9f7b0a3778dc2f02dc967ebc720bdbca8d3631b0461f3b9d05
-SHA512 (rust-std-1.61.0-powerpc-unknown-netbsd.tar.xz) = 3d30a7c2c179ba619b5e26d7f3fc5836bcfce674e0761541af2bed64e1a139247559e011b2656f76ea7eb82f613d4e04811c6efa62527bdebf9d7c1f126b8ae5
-Size (rust-std-1.61.0-powerpc-unknown-netbsd.tar.xz) = 21332952 bytes
-BLAKE2s (rust-std-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 27b508588df75b65a4615a58243b5886e3e27945311b95cb13166d8c5aa0a75c
-SHA512 (rust-std-1.61.0-powerpc-unknown-netbsd90.tar.xz) = f139d347f8605bc42065db26dc7d1a434413ec253785040ad6fac7a79ec273df18171369c2997491ece6492790055f7e604471f9df838ac92b424f6e986e392f
-Size (rust-std-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 21334304 bytes
-BLAKE2s (rust-std-1.61.0-sparc64-unknown-netbsd.tar.xz) = c299a2ec5cd573f032fc76c0e702cbb5576d77cc42b90de31f54a3b310c572d7
-SHA512 (rust-std-1.61.0-sparc64-unknown-netbsd.tar.xz) = bb1749000628b9e35af994cd1722007a477435a113d5c95d6281abb61cbe06a9790de9c591ffa8cc9a2164eb345cf96a8dab0a2319bb6d78ed5a5d3cbe92fc75
-Size (rust-std-1.61.0-sparc64-unknown-netbsd.tar.xz) = 21462720 bytes
-BLAKE2s (rust-std-1.61.0-x86_64-apple-darwin.tar.gz) = 1ce8738fc0ce4e5864feb0cd2b70129a4faff271cef06e19cd490131f98cc941
-SHA512 (rust-std-1.61.0-x86_64-apple-darwin.tar.gz) = 37a36ed8abc2a304feb85d431731baf2d3fdca894e15a70691ec03758c224a77040d0397b7cd8a116f1780016feecb188daf73363b9f1f699b728db17b5f41d9
-Size (rust-std-1.61.0-x86_64-apple-darwin.tar.gz) = 41009315 bytes
-BLAKE2s (rust-std-1.61.0-x86_64-unknown-freebsd.tar.gz) = 1f92252ef318448abefb42ab70b3b4586ea1bf11b1ebfc8c13ae421f5fb18561
-SHA512 (rust-std-1.61.0-x86_64-unknown-freebsd.tar.gz) = c17cea0286ef48c9d7bd3af9e0995a2195f57a0fdf0eac27c95d356f1203ab173e94fa007bf70b7a81547a0f71a5236510bdd7f0dd69c836bb689fbcd678b046
-Size (rust-std-1.61.0-x86_64-unknown-freebsd.tar.gz) = 43121370 bytes
-BLAKE2s (rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 825453fd8e2badb7f1d2acc09ace3b5b581032db111e090c81c27cf369758804
-SHA512 (rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 57d8f2647f8732fb4c3d8b9581822911d650d4d5f32c01ab60158b38626cfff416cd435231fb312aa4c09da823a59bbb5a50492c8d197d2c628f793c9791dd30
-Size (rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 44597191 bytes
-BLAKE2s (rust-std-1.61.0-x86_64-unknown-netbsd.tar.xz) = 65c40ed6e23cecae9dbab49f746140887be77cb4bffd588df957d25ec025f68a
-SHA512 (rust-std-1.61.0-x86_64-unknown-netbsd.tar.xz) = 4dfee06b1cd8a7d0a1f1b24d402e40fe0b751e3ae38ace8ad93c5d7384da7228079a4de5e402d32c3b087027dea4b86354f6a0af327c7781cfa602786613e098
-Size (rust-std-1.61.0-x86_64-unknown-netbsd.tar.xz) = 26321476 bytes
-BLAKE2s (rustc-1.62.1-src.tar.gz) = 9471494b3df9069180c442607764884f29f24ce1ed5aea1943aa5a54ada7d4bd
-SHA512 (rustc-1.62.1-src.tar.gz) = cbc8127145db1e3e6c3113fd3db44b500d9cac05e7a8b55cab63c6016d2de617c40786d77603b08c54a437f712f306a728cc1a7421de4c879ea4bb599e49d140
-Size (rustc-1.62.1-src.tar.gz) = 202198995 bytes
+BLAKE2s (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 2732461c3d84cd516563afedc5513f377e3a6796c931ef03601fdcbcc4e6fe33
+SHA512 (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = e99f53fd801d09f28dfd0568a8f2e97a5c4d5d0de7bea28f5afdc91d02f27ff887627f7717c032b90af412e4c04fc11c80c91f42e4b8dab885a311d56fdd5542
+Size (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 197829953 bytes
+BLAKE2s (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 95884eba580edfe3fc8e41aa48a01d7b881e849350598358422d3e5fd20e5d55
+SHA512 (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 11d32205ef962b7bd19209dc4e2627d97d97392f333f712c26f5b9b4d2ea895608e5dfbf38280e0433b9da9e5cd037a182b9ac4a744dd188540b491bd5dc19ad
+Size (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 226819968 bytes
+BLAKE2s (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = d0414d0746877449f3aea03ad2ee8564d6878aa75471c9402d37fb227b0a76cf
+SHA512 (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = efc20cdab9d15d0d80ce842d10a315260932e6b8e7bf076112f85b1c2cb7526b5761b9c49571880e8818ad6f7c2ce53d379d72eb40aafc65de6e5825c7175598
+Size (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 391230027 bytes
+BLAKE2s (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 9d297948e81774780669461261048e6964e38b991301bcb1e72d002f567fe642
+SHA512 (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 609469f1938a6bd88089391605d708228ab760c09f2624d2c89fc2ae2f17ca466aeba96fecb7a31f5e18fc9b175b47c80ce8f425b015fe2a8fb3fd2684220c28
+Size (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 153006012 bytes
+BLAKE2s (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 98f0839e7c3886381279e9c32b9a203c5912db46c437f47f4af9f2be65ab5a11
+SHA512 (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 06e9254a8e31bba1eee83d5851a1dfdb17671863f3370325827f16cbaa9b264ab3dfdad33f4c212e5afb1a1653aa159fd34c11b3f448cc28f21c0de95f0b0950
+Size (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 152149492 bytes
+BLAKE2s (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 3e6364849b34f8f8c309ff80094b3a74b6b4c3e182e554f6e1cc5b395143d450
+SHA512 (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = aae29513d35aeb550f0e8372849d39baf868406aa30804b808fb0e13f3125694f1602c1645d2a63d2d036196e4de7b8d4fd85b3e61a87d48f29a19e62a7b2630
+Size (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 321045815 bytes
+BLAKE2s (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = f66caf358af54016ed655a57585025c3f91a4199ab4845132a42b61b6b40ef94
+SHA512 (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = dd5498837e07b3f41a67f0aec6f77c5f2026cf3723b5f6931621e2d8921bacf6eed6dfa2f1d81dd6b69ac839334e0fd74201f60209da8607916a2834b5e463a9
+Size (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 312568849 bytes
+BLAKE2s (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 3ea6b09bfb7a4f5fbbda3977739bdad66fe1ec4a4f47cdf23379f706ee257918
+SHA512 (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = cf6a142404aebabf9196ea39095034984bd2f6582711527e341dddc35acca23e19d5f5769bfcf99a623a2d746664621c56cc7055796bd1983df84fa5bb3864a0
+Size (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 134947696 bytes
+BLAKE2s (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 17aa9922d662804485cd242979ebea0c5404bc508a434c1697f2beb9150046c6
+SHA512 (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 3169dbcd30e3bd766e3ebe896c0963ba3875683da5cf192e933903423147d6bb463fa9223990e6766c802b0a8aba52d8da099ff068bb34008ba57ba705ba1355
+Size (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 165954144 bytes
+BLAKE2s (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = 0fe5431cd25ca1eb5b0029d88a387934f8ce4cedc9991914561f9429c390328f
+SHA512 (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = b0948781b4ae987f297e22dcbf81446837536af26994dfa30bd1fd5be050ed613d9f4114105c1b71cce03d3cb8e4d105e23285bf1f5cdd372b45dd63c0fb9f12
+Size (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = 368878800 bytes
+BLAKE2s (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = b2d8e8e82e555bccfae49c3ecb7f710e5387d2fab724aae9fe85707d2cea7e45
+SHA512 (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = 8800cc0e387ab9a4576ef581da70cccf5b9bc5cff1889e36654ab2f05fe8f10be5b43322a4f160a7f2ab94792c3202aeaa0b3b0eacf7afbec0182fb6c3637b5a
+Size (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = 169776912 bytes
+BLAKE2s (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = b730c7c724860331fb3d53ec2807147acc6734c12e23419e5a950347e6e1239e
+SHA512 (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = bbc739c9bfea90a74a06ed6afa43e6ff1ca0ed2a7a66fa25269cf6d09cfb40fce50f240d81bd8821a3c42e738d876b0e73c6b1b8b5242f399d3f907051bc3e94
+Size (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 177559744 bytes
+BLAKE2s (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = ffdc19c697f49dd575abe6617c658e354e73f4a77c9395275a14ebf321b3e3d1
+SHA512 (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = 91a1a477ab0c797949610a287e6bfd23e50ce1007fa8fa69bdebb4b29de689813d093be3c6d7bcf2ba57415af92416cb741beb9377fe9bb1c2215a59c3a49c57
+Size (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = 149239740 bytes
+BLAKE2s (rust-1.62.1-x86_64-apple-darwin.tar.gz) = 7125c2c82f869d3f80591165bf249237770a1fa6c2b539c49e7bf5f85f232295
+SHA512 (rust-1.62.1-x86_64-apple-darwin.tar.gz) = e97dae43eaa0fb621a68408409f3ab7f34f26f6fa9c301a3435d6a4b5dd04e9fa2fdc9bbe5aa6dd0bad6f8c72db3af89f5147cf64cbe60dcaa93c93cede3a3a5
+Size (rust-1.62.1-x86_64-apple-darwin.tar.gz) = 291881993 bytes
+BLAKE2s (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = b44a4316025cf81b7acc3b4d42f40cb1f0b38492089741fed6037d8fe3a2ad35
+SHA512 (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = 160200cf8395e084c4bfc8dd403af67cbc883bce41df1337125d74044b75d6cd227ace44e3400ddcd7f0b84a9cda26657d3d9b33582490c98b93992f8cc4ae6c
+Size (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = 287568888 bytes
+BLAKE2s (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 7a0660bdf1e7a653686d9b6b0b3ff878b4f551f8de586fa7de03d5e89ae565fe
+SHA512 (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 55125402c787df1c7cf10145902cd882077baa1bef032db71dbed46d1ed467f838e5d88c51753475fe84a89b61b557c895804aef134f6a0e2b016f3c7e68e164
+Size (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 265631587 bytes
+BLAKE2s (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = 94e420fe58a0af5359d5947774e3eb89576eeac81830dceaf884474d40f07032
+SHA512 (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = ff1051a9152cc5706c8c6d6be6d23d73b913313bfc4e8212196f2356503f8016f26c9fc5551564a5d7063a801038ea719024dadca0cded60f47b1d7263737e72
+Size (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = 172701916 bytes
+BLAKE2s (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = a7ad0d562f59962afa64b81c70db13c6d669911a1d3a15da95325930f007b159
+SHA512 (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = 205dd929ca91999d2377ef474af557d55c18372ff1825d19ebff214903979da02058bb664bc5ffb0989b8b641642249600f2e16bbb5ce4f5b55e2500b28cbce0
+Size (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = 39464902 bytes
+BLAKE2s (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 40e29a9153706a8d899c3164899c6bd9ebf1cac35d1776a28cb9205b8f663f8e
+SHA512 (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 0a80fb1d155d2d56b2a0ec5fa93114c67c3eafb4fa4335536eb1b883e1bccb5cf69594ead247195fa1b5e7eec7481bb35959b2b6f10e49b982d83d2152e89545
+Size (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 56992887 bytes
+BLAKE2s (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = b1525521d522b64edb248223d78584b3ed4d9b63608b7f1c0c3f06ba76ebf95d
+SHA512 (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = 764a3479a197ec77a3f4ca9c1ed03c79616ae49518e696d7caa8672806356439108779e6ab92b6bc1a86c8d14aea06bbaab4bbf802bcfe4d2c00679e0ecd429e
+Size (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = 22650524 bytes
+BLAKE2s (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 3010fa11f7ee3f45c6c421372f45f98a633265638e596ed67468256d1946e0d4
+SHA512 (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = deeec40da779492ee73494de41949c8f5f0670e4a3fa163d1393a36ec3d9d6ef13946b18ed37e83363fe3f0d7560a8922f6ee3158b11a8a9f4693db99d13cacc
+Size (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 22464008 bytes
+BLAKE2s (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = b7f165cddba9d738a372cc0905bb80ae1c8b0ea85c255a72b7fe5d9387d74ab3
+SHA512 (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 49b90056ca67cdb0bb8c9a5803c6074bd620c964037d71fbb1de4cecdc6dd9f655e0e66ba605db3af783a62eb863eadacc1275b1103ac03559ddb1290b50a1ed
+Size (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 35692832 bytes
+BLAKE2s (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 69d4685e118e25bf65bfc22675bc6fc6906f35ba475a8eb34e09f0a8d94e7bee
+SHA512 (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 665f0b49572017ef9035acdd587df02b779053ee288660c25410fc01cd4ad76c01754fec9573c2ef699642c6b65a1c195447ca06399cbe2ec29e489c84390d94
+Size (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 37547880 bytes
+BLAKE2s (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 116abcf083beaf6592a7b268694cd22005c81871a6c6d28d2784a6eb51b7ca83
+SHA512 (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = aba210f8bbaadaf365e72fbbceb7ac862c06fe01e9be5c4de04b5420f1c17097f5197b7e1475ee36690fad46419e0400adc8473ae4906a48ade069e34fe5eeb2
+Size (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 21749880 bytes
+BLAKE2s (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 4aab9d204a04b9ab9fa54416161730330404cbf4ece0fd7de0094570941b5609
+SHA512 (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 9289ecea292a1e29e2b420185cc8445bcefcadf50ff0069a4b49a2e8364b70052925d59d05c5c1427a43e0d85357219c95723ffc4df82041954fd8074b0267dc
+Size (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 22647628 bytes
+BLAKE2s (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 61ef685652975dce70e0df29c0f0cdcb768f4762102fc1dbaaa39fe99f7e16b7
+SHA512 (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 1b151013827bc9ced16589bb8ea379a292ad0343236a48f4d7ad945b71c4e50ab2c269c440c0fbdcaa28fccb379449c7958f7f0bc70ff7e7aa3d0777f1d6c668
+Size (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 39451796 bytes
+BLAKE2s (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = 4d2341868558edc8cdd59d8244dc4e7c9ff3170eb347b382ddf84daf8367cf84
+SHA512 (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = ab05aa5b6b34608e2b72266d0b2d9c937be727dc2a914ae4ab83a00c50c89927e85c3f3fe34e82131aca3d7c40835da791c4eb6afba3558f55c6518b82dbb770
+Size (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = 20522208 bytes
+BLAKE2s (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = b5fd541cb5ed7d6ec45e3ac122521d3268129a6a54a6f545118ed703170c310a
+SHA512 (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 9fbc7ec69db6652f80c1e5f9fe5f087e3fa82d25c0f6c0137af4d7020a208175a8372d0ae0e407c3b67fee8eb5319a3f41746de97f3be95ceb443e401733207e
+Size (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 20519232 bytes
+BLAKE2s (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = 8f9c9961e18d345893d8a8e37324883de682d08049a91ed321aef123fae3b0f2
+SHA512 (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = e9a355ecc772acc90d382c5333e6b5195a91b284a9f4a4c68a6fe8e8805ac2505bd68191f34c0e3332a4ee2577e324aff7055257eb562b139552d91c8217bcb7
+Size (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = 20607296 bytes
+BLAKE2s (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 24589c5da00d22c1727eaf7149ea613e6216d8e81be55971fe2a95afa7c21c6a
+SHA512 (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 7693dbcd780fee8b2f4372f86ca1c0c3620280cf3b20ee9bf155ff32e410a7faa263545b5a8f51b1e77597eeb5b357dd070fe95e1f132db92bcc38afcbd3d4a4
+Size (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 40146874 bytes
+BLAKE2s (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = aff2086bb0de53f4e5af1d54798d872dad6ef67ee56a97a78eefad39fe82dfe8
+SHA512 (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = 4de5cd33c06430fbd77f484baa440508aacb62252995bee56dd4653855312c1b438e2005941411a89613ea247413b311fd60b235fd30c13253fcd291ccfd2dab
+Size (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = 42381072 bytes
+BLAKE2s (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 578e330e17e1cd7d5c5ee632a53a980ab5ce3669f13a480896e1033f4c1d3832
+SHA512 (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 912cb0b0f3bfe296300ca9764ea3695716e674600ada36a7252a7e5fceadff2afca65f6a3aac80e3303425e177ecf1b0db1dcfc48aad0eb573f1d2db112e6692
+Size (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 43773106 bytes
+BLAKE2s (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = 99769fb8e8fd92d22e53227ded03d207c4ddeabf1cfb3f1088edfc637727e2be
+SHA512 (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = d72824448ce83c94ec2b559a5fc769c8a8441293df4ca9b491e91ee1c42c0159ec8e2bbc9eaaa68e2d31b889a257d8d5743ef62ec10786caf5f017a8c5e3eca2
+Size (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = 25464592 bytes
+BLAKE2s (rustc-1.63.0-src.tar.gz) = 0fd32c49a5e919cc01a7f8faefe66132c4462b5a1275115427ec879c007da894
+SHA512 (rustc-1.63.0-src.tar.gz) = 8c4ce20f0e6ddf86c13e24f222846dbcddc6b8fccc5490b1c41877df3ecf2543bf5fd88431d2e6d23280f90c0395f0d812b4ad7c13098128b043669660911299
+Size (rustc-1.63.0-src.tar.gz) = 203449048 bytes
 SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a9a891b9c507958354fb819587d6d4b31ff83ce6
 SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
 SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
@@ -131,8 +131,7 @@ SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f26
 SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
 SHA1 (patch-vendor_cc-1.0.69_src_lib.rs) = b5c0f795624b928b8b02fe01174e6a24e770adea
 SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
-SHA1 (patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs) = d0af451a8d6a2061cf470968069e4270e5cfcb73
-SHA1 (patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs) = a0177bbfa1935ea5001551fd93e92fef41890089
+SHA1 (patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e447bd34d0dd7c6a51fbc27dfae50129d0b33462
 SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 351e213fc07b0dc7c35d70d6a0c2ecc6b5b9056e
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
 SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index 3649f8bad9..0239bba0ec 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -1,3 +1,4 @@
+# $NetBSD$
 # Do all the NetBSD cross builds
 # Collect the bootstrap kits in dist/
 
@@ -17,34 +18,34 @@ SHORT_TARGETS+=	i386
 
 # Root of target directories.
 # Must have dest/ (build.sh's DESTDIR) and tools/ subdirectories
-ROOT.armv7?=	/u/evbarm-armv7hf
-ROOT.sparc64?=	/u/sparc64
-ROOT.powerpc?=	/u/macppc
-ROOT.powerpc90?=/u/9.0-macppc
-ROOT.arm64?=	/u/evbarm64
-ROOT.arm64_be?=	/u/evbarm64eb
-ROOT.i386?=	/u/i386
+ROOT.armv7?=		/u/evbarm-armv7hf
+ROOT.sparc64?=		/u/sparc64
+ROOT.powerpc?=		/u/macppc
+ROOT.powerpc90?=	/u/9.0-macppc
+ROOT.arm64?=		/u/evbarm64
+ROOT.arm64_be?=		/u/evbarm64eb
+ROOT.i386?=		/u/i386
 
 # Mapping to GNU triple
-G_TGT.armv7=	armv7--netbsdelf-eabihf
-G_TGT.sparc64=	sparc64--netbsd
-G_TGT.powerpc=	powerpc--netbsd
-G_TGT.powerpc90=powerpc--netbsd
-G_TGT.arm64=	aarch64--netbsd
-G_TGT.arm64_be=	aarch64_be--netbsd
-G_TGT.i386=	i486--netbsdelf
+G_TGT.armv7=		armv7--netbsdelf-eabihf
+G_TGT.sparc64=		sparc64--netbsd
+G_TGT.powerpc=		powerpc--netbsd
+G_TGT.powerpc90=	powerpc--netbsd
+G_TGT.arm64=		aarch64--netbsd
+G_TGT.arm64_be=		aarch64_be--netbsd
+G_TGT.i386=		i486--netbsdelf
 
 # Mapping to rust's TARGET specification
-TGT.armv7=	armv7-unknown-netbsd-eabihf
-TGT.sparc64=	sparc64-unknown-netbsd
-TGT.powerpc=	powerpc-unknown-netbsd
-TGT.powerpc90=	powerpc-unknown-netbsd
-TGT.arm64=	aarch64-unknown-netbsd
-TGT.arm64_be=	aarch64_be-unknown-netbsd
-TGT.i386=	i586-unknown-netbsd
+TGT.armv7=		armv7-unknown-netbsd-eabihf
+TGT.sparc64=		sparc64-unknown-netbsd
+TGT.powerpc=		powerpc-unknown-netbsd
+TGT.powerpc90=		powerpc-unknown-netbsd
+TGT.arm64=		aarch64-unknown-netbsd
+TGT.arm64_be=		aarch64_be-unknown-netbsd
+TGT.i386=		i586-unknown-netbsd
 
 # Optional target tweak for bootstrap files
-TT.powerpc90=	powerpc-unknown-netbsd90
+TT.powerpc90=		powerpc-unknown-netbsd90
 
 WRKDIR=		${.CURDIR}/work
 SCRIPTS=	${WRKDIR}/scripts
@@ -68,7 +69,7 @@ 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}"
+	${ECHO} "=======> Cross-building rust for ${st}"
 	${DEBUG} make -f Makefile clean
 	${DEBUG} env \
 		CROSS_ROOT=${ROOT.${st}} \
@@ -86,14 +87,13 @@ do-${st}:
 		src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
 		tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
 		if [ ! -f "$${tgt}" ]; then \
-			echo ln $${src} $${tgt}; \
+			${ECHO} ln $${src} $${tgt}; \
 			${DEBUG} ln $${src} $${tgt}; \
 		fi; \
 	done; \
 	src_comp=rust-src-${V_NOREV}.tar.xz; \
 	if [ ! -f dist/$${src_comp} ]; then \
-		echo ln $${distdir}/$${src_comp} dist; \
+		${ECHO} ln $${distdir}/$${src_comp} dist; \
 		${DEBUG} ln $${distdir}/$${src_comp} dist; \
 	fi
 .endfor
-
diff --git a/rust/options.mk b/rust/options.mk
index b381c48d83..6529f432cb 100644
--- a/rust/options.mk
+++ b/rust/options.mk
@@ -12,6 +12,7 @@ PKG_SUPPORTED_OPTIONS+=		rust-internal-llvm
 .  if !empty(HAVE_LLVM) || !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
 PKG_SUGGESTED_OPTIONS+=		rust-internal-llvm
 .  endif
+.endif
 
 # If cross-building, always use the internal LLVM
 .if !empty(TARGET)
@@ -32,7 +33,6 @@ PKG_OPTIONS_LEGACY_OPTS+=	rust-llvm:rust-internal-llvm
 # Use the internal copy of LLVM or the external one?
 #
 .if empty(PKG_OPTIONS:Mrust-internal-llvm)
-BUILDLINK_API_DEPENDS.llvm+=	llvm>=12.0.0
 .include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-llvm-link-shared
 #CONFIGURE_ARGS+=	--llvm-libunwind=system
diff --git a/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 2cfbdfe8d0..652421f0c1 100644
--- a/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -2,9 +2,9 @@ $NetBSD$
 
 Copy execinfo function definitions from openbsd's mod.rs.
 
---- vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-05-18 03:01:05.000000000 +0000
+--- vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-08-09 00:43:08.000000000 +0000
 +++ vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2788,6 +2788,23 @@ extern "C" {
+@@ -2788,6 +2788,22 @@ extern "C" {
      pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
  }
  
@@ -23,7 +23,6 @@ Copy execinfo function definitions from openbsd's mod.rs.
 +        fmt: *const ::c_char,
 +    ) -> *mut *mut ::c_char;
 +}
-+
 +
  cfg_if! {
      if #[cfg(target_arch = "aarch64")] {
diff --git a/rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs
deleted file mode 100644
index d925c25d65..0000000000
--- a/rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Copy execinfo function definitions from openbsd's mod.rs.
-
---- vendor/libc-0.2.123/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-06-27 15:22:31.000000000 +0000
-+++ vendor/libc-0.2.123/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2784,6 +2784,22 @@ extern "C" {
-     pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
- }
- 
-+#[link(name = "execinfo")]
-+extern "C" {
-+    pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
-+    pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char;
-+    pub fn backtrace_symbols_fd(
-+        addrlist: *const *mut ::c_void,
-+        len: ::size_t,
-+        fd: ::c_int,
-+    ) -> ::c_int;
-+    pub fn backtrace_symbols_fmt(
-+        addrlist: *const *mut ::c_void,
-+        len: ::size_t,
-+        fmt: *const ::c_char,
-+    ) -> *mut *mut ::c_char;
-+}
-+
- cfg_if! {
-     if #[cfg(target_arch = "aarch64")] {
-         mod aarch64;
Prev by Date: showfont: update to 1.0.6.
Next by Date: qt6-qtbase: add comment to patch about it being sent upstream
Previous by Thread: showfont: update to 1.0.6.
Next by Thread: qt6-qtbase: add comment to patch about it being sent upstream
Indexes:
Home | Main Index | Thread Index | Old Index