summaryrefslogtreecommitdiff
path: root/lang/rust
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2022-05-25 21:31:26 +0000
committerhe <he@pkgsrc.org>2022-05-25 21:31:26 +0000
commit6df74feea1d789d19918b749e53ef6447595d396 (patch)
tree6d7b79aac1ed596ae819aa6660f971f867e74cea /lang/rust
parente38447ffb3d72ea81c80ee413797d52bd6fdfad1 (diff)
downloadpkgsrc-6df74feea1d789d19918b749e53ef6447595d396.tar.gz
lang/rust: update to version 1.60.0.
Pkgsrc changes: * Bump available bootstraps to 1.59.0. * Adjust line number in patches which had non-zero offsets. Upstream changes: Version 1.60.0 (2022-04-07) =========================== Language -------- - [Stabilize `#[cfg(panic = "...")]` for either `"unwind"` or `"abort"`.] [93658] - [Stabilize `#[cfg(target_has_atomic = "...")]` for each integer size and `"ptr"`.][93824] Compiler -------- - [Enable combining `+crt-static` and `relocation-model=pic` on `x86_64-unknown-linux-gnu`][86374] - [Fixes wrong `unreachable_pub` lints on nested and glob public reexport][87487] - [Stabilize `-Z instrument-coverage` as `-C instrument-coverage`][90132] - [Stabilize `-Z print-link-args` as `--print link-args`][91606] - [Add new Tier 3 target `mips64-openwrt-linux-musl`\*][92300] - [Add new Tier 3 target `armv7-unknown-linux-uclibceabi` (softfloat)\*][92383] - [Fix invalid removal of newlines from doc comments][92357] - [Add kernel target for RustyHermit][92670] - [Deny mixing bin crate type with lib crate types][92933] - [Make rustc use `RUST_BACKTRACE=full` by default][93566] - [Upgrade to LLVM 14][93577] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Guarantee call order for `sort_by_cached_key`][89621] - [Improve `Duration::try_from_secs_f32`/`f64` accuracy by directly processing exponent and mantissa][90247] - [Make `Instant::{duration_since, elapsed, sub}` saturating][89926] - [Remove non-monotonic clocks workarounds in `Instant::now`][89926] - [Make `BuildHasherDefault`, `iter::Empty` and `future::Pending` covariant][92630] Stabilized APIs --------------- - [`Arc::new_cyclic`][arc_new_cyclic] - [`Rc::new_cyclic`][rc_new_cyclic] - [`slice::EscapeAscii`][slice_escape_ascii] - [`<[u8]>::escape_ascii`][slice_u8_escape_ascii] - [`u8::escape_ascii`][u8_escape_ascii] - [`Vec::spare_capacity_mut`][vec_spare_capacity_mut] - [`MaybeUninit::assume_init_drop`][assume_init_drop] - [`MaybeUninit::assume_init_read`][assume_init_read] - [`i8::abs_diff`][i8_abs_diff] - [`i16::abs_diff`][i16_abs_diff] - [`i32::abs_diff`][i32_abs_diff] - [`i64::abs_diff`][i64_abs_diff] - [`i128::abs_diff`][i128_abs_diff] - [`isize::abs_diff`][isize_abs_diff] - [`u8::abs_diff`][u8_abs_diff] - [`u16::abs_diff`][u16_abs_diff] - [`u32::abs_diff`][u32_abs_diff] - [`u64::abs_diff`][u64_abs_diff] - [`u128::abs_diff`][u128_abs_diff] - [`usize::abs_diff`][usize_abs_diff] - [`Display for io::ErrorKind`][display_error_kind] - [`From<u8> for ExitCode`][from_u8_exit_code] - [`Not for !` (the "never" type)][not_never] - [_Op_`Assign<$t> for Wrapping<$t>`][wrapping_assign_ops] - [`arch::is_aarch64_feature_detected!`][is_aarch64_feature_detected] Cargo ----- - [Port cargo from `toml-rs` to `toml_edit`][cargo/10086] - [Stabilize `-Ztimings` as `--timings`][cargo/10245] - [Stabilize namespaced and weak dependency features.][cargo/10269] - [Accept more `cargo:rustc-link-arg-*` types from build script output.][cargo/10274] - [cargo-new should not add ignore rule on Cargo.lock inside subdirs][cargo/10379] Misc ---- - [Ship docs on Tier 2 platforms by reusing the closest Tier 1 platform docs][92800] - [Drop rustc-docs from complete profile][93742] - [bootstrap: tidy up flag handling for llvm build][93918] Compatibility Notes ------------------- - [Remove compiler-rt linking hack on Android][83822] - [Mitigations for platforms with non-monotonic clocks have been removed from `Instant::now`][89926]. On platforms that don't provide monotonic clocks, an instant is not guaranteed to be greater than an earlier instant anymore. - [`Instant::{duration_since, elapsed, sub}` do not panic anymore on underflow, saturating to `0` instead][89926]. In the real world the panic happened mostly on platforms with buggy monotonic clock implementations rather than catching programming errors like reversing the start and end times. Such programming errors will now results in `0` rather than a panic. - In a future release we're planning to increase the baseline requirements for the Linux kernel to version 3.2, and for glibc to version 2.17. We'd love your feedback in [PR #95026][95026]. 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. - [Switch all libraries to the 2021 edition][92068] [83822]: https://github.com/rust-lang/rust/pull/83822 [86374]: https://github.com/rust-lang/rust/pull/86374 [87487]: https://github.com/rust-lang/rust/pull/87487 [89621]: https://github.com/rust-lang/rust/pull/89621 [89926]: https://github.com/rust-lang/rust/pull/89926 [90132]: https://github.com/rust-lang/rust/pull/90132 [90247]: https://github.com/rust-lang/rust/pull/90247 [91606]: https://github.com/rust-lang/rust/pull/91606 [92068]: https://github.com/rust-lang/rust/pull/92068 [92300]: https://github.com/rust-lang/rust/pull/92300 [92357]: https://github.com/rust-lang/rust/pull/92357 [92383]: https://github.com/rust-lang/rust/pull/92383 [92630]: https://github.com/rust-lang/rust/pull/92630 [92670]: https://github.com/rust-lang/rust/pull/92670 [92800]: https://github.com/rust-lang/rust/pull/92800 [92933]: https://github.com/rust-lang/rust/pull/92933 [93566]: https://github.com/rust-lang/rust/pull/93566 [93577]: https://github.com/rust-lang/rust/pull/93577 [93658]: https://github.com/rust-lang/rust/pull/93658 [93742]: https://github.com/rust-lang/rust/pull/93742 [93824]: https://github.com/rust-lang/rust/pull/93824 [93918]: https://github.com/rust-lang/rust/pull/93918 [95026]: https://github.com/rust-lang/rust/pull/95026 [cargo/10086]: https://github.com/rust-lang/cargo/pull/10086 [cargo/10245]: https://github.com/rust-lang/cargo/pull/10245 [cargo/10269]: https://github.com/rust-lang/cargo/pull/10269 [cargo/10274]: https://github.com/rust-lang/cargo/pull/10274 [cargo/10379]: https://github.com/rust-lang/cargo/pull/10379 [arc_new_cyclic]: https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#method.new_cyclic [rc_new_cyclic]: https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#method.new_cyclic [slice_escape_ascii]: https://doc.rust-lang.org/stable/std/slice/struct.EscapeAscii.html [slice_u8_escape_ascii]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.escape_ascii [u8_escape_ascii]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.escape_ascii [vec_spare_capacity_mut]: https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#method.spare_capacity_mut [assume_init_drop]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.assume_init_drop [assume_init_read]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.assume_init_read [i8_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.abs_diff [i16_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.abs_diff [i32_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.abs_diff [i64_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.abs_diff [i128_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.abs_diff [isize_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.abs_diff [u8_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.abs_diff [u16_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.abs_diff [u32_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.abs_diff [u64_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.abs_diff [u128_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.abs_diff [usize_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.abs_diff [display_error_kind]: https://doc.rust-lang.org/stable/std/io/enum.ErrorKind.html#impl-Display [from_u8_exit_code]: https://doc.rust-lang.org/stable/std/process/struct.ExitCode.html#impl-From%3Cu8%3E [not_never]: https://doc.rust-lang.org/stable/std/primitive.never.html#impl-Not [wrapping_assign_ops]: https://doc.rust-lang.org/stable/std/num/struct.Wrapping.html#trait-implementations [is_aarch64_feature_detected]: https://doc.rust-lang.org/stable/std/arch/macro.is_aarch64_feature_detected.html
Diffstat (limited to 'lang/rust')
-rw-r--r--lang/rust/Makefile66
-rw-r--r--lang/rust/distinfo240
-rw-r--r--lang/rust/do-cross.mk26
-rw-r--r--lang/rust/options.mk4
-rw-r--r--lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs4
-rw-r--r--lang/rust/patches/patch-compiler_rustc__llvm_build.rs4
-rw-r--r--lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs4
-rw-r--r--lang/rust/patches/patch-library_std_src_sys_unix_thread.rs4
-rw-r--r--lang/rust/patches/patch-library_unwind_build.rs4
-rw-r--r--lang/rust/patches/patch-src_bootstrap_bootstrap.py10
-rw-r--r--lang/rust/patches/patch-src_bootstrap_builder.rs6
-rw-r--r--lang/rust/patches/patch-src_bootstrap_compile.rs4
-rw-r--r--lang/rust/patches/patch-src_bootstrap_lib.rs4
-rw-r--r--lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt4
-rw-r--r--lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake4
-rw-r--r--lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp4
-rw-r--r--lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs4
-rw-r--r--lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs6
-rw-r--r--lang/rust/patches/patch-vendor_cc_src_lib.rs4
-rw-r--r--lang/rust/patches/patch-vendor_libc-0.2.112_src_unix_bsd_netbsdlike_netbsd_mod.rs (renamed from lang/rust/patches/patch-vendor_libc-0.2.108_src_unix_bsd_netbsdlike_netbsd_mod.rs)8
-rw-r--r--lang/rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs29
-rw-r--r--lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs29
-rw-r--r--lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs4
-rw-r--r--lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs27
-rw-r--r--lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs14
-rw-r--r--lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs4
-rw-r--r--lang/rust/platform.mk16
27 files changed, 273 insertions, 264 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index d4742772512..a43f1b6496c 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.257 2022/05/24 09:37:43 nia Exp $
+# $NetBSD: Makefile,v 1.258 2022/05/25 21:31:26 he Exp $
-DISTNAME= rustc-1.59.0-src
+DISTNAME= rustc-1.60.0-src
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/
-PKGREVISION= 2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://www.rust-lang.org/
@@ -21,6 +20,9 @@ USE_LANGUAGES= c c++11
USE_LIBTOOL= yes
USE_TOOLS+= bash grep gmake perl:build pkg-config
+# The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
+# build on 7). Mark earlier versions as broken.
+BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-*
# Bootstrap is built for NetBSD 9.x on these platforms:
BROKEN_ON_PLATFORM+= NetBSD-8.*-*arm*
BROKEN_ON_PLATFORM+= NetBSD-8.*-aarch64
@@ -67,7 +69,6 @@ MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
MAKE_ENV.Darwin+= MACOSX_DEPLOYMENT_TARGET="10.7"
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
-MAKE_ENV.SunOS+= AR=gar
UNLIMIT_RESOURCES+= cputime datasize virtualsize
@@ -79,10 +80,6 @@ CHECK_SSP_SUPPORTED= no
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
-BROKEN+= "Bootstrap unavailable for old NetBSD version"
-.endif
-
# Allow overriding MAKE_JOBS_SAFE
# some may chose to mostly build faster,
# and deal with any failures due to deadlocks
@@ -173,7 +170,7 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
DISTFILES:= ${DEFAULT_DISTFILES}
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -181,7 +178,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -189,7 +186,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -197,7 +194,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -205,7 +202,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -213,7 +210,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -221,7 +218,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -248,7 +245,7 @@ CONFIGURE_ARGS+= --target=${RUST_ARCH}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.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
@@ -256,7 +253,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.0
RUST_ARCH= i586-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -274,7 +271,7 @@ pre-build-fix:
${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.58.1
+RUST_STAGE0_VER= 1.59.0
RUST_ARCH= x86_64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -282,7 +279,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.0
RUST_ARCH= powerpc-unknown-netbsd
# Cross-built against NetBSD 9.0
@@ -295,7 +292,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
. endif
# Cross-built against NetBSD 8.0
-. if ${OPSYS_VERSION} < 090000 || make(distinfo) || make(makesum) || make(mdi)
+. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
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}
@@ -306,7 +303,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.0
RUST_ARCH= aarch64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -316,7 +313,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.0
RUST_ARCH= aarch64_be-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -326,7 +323,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.0
RUST_ARCH= sparc64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -337,7 +334,7 @@ pre-build-fix:
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER= 1.58.1
+RUST_STAGE0_VER= 1.59.0
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}
@@ -376,17 +373,14 @@ SUBST_VARS.rpath= PREFIX
# than one substitution entry per file, but are kept separate below to ease
# updating and verification.
#
-#CKSUM_CRATES+= vendor/cc
-#CKSUMS+= 6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
-#CKSUMS+= 1244e301c58e7f693f14ad23b02713cdd38259928a6ca905336891e869e6743e
-CKSUM_CRATES+= vendor/libc-0.2.108
-CKSUMS+= ddbdc8526a0267ffeb0ab9bb5f01ebb38a14cf759c025b5c0b0ff1178fec889b
-CKSUMS+= b8330ddc0af8fa8d57f715eebabf0b0e4bcbef85894eee4a0f7aa0f748c29106
+#CKSUM_CRATES+= vendor/cc-1.0.69
+#CKSUMS+= dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
+#CKSUMS+= 6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
-CKSUM_CRATES+= vendor/rustc-ap-rustc_target
-CKSUMS+= 673ac3b6875d487ace59b01725d83d2fab4af60615d1f8edd95bf21295947433
-CKSUMS+= 5a8bae7d5b6feb07a75226ad061455298f05627086a3b444cb2a1a6272899d88
+CKSUM_CRATES+= vendor/libc-0.2.116
+CKSUMS+= 5f927d3d26165689b3ae7a7535ea5504068a406ef76705572c610995dbea1f0e
+CKSUMS+= a8da54099bdddb92bd0150fd23b90a7d94216927297b7b24bee219e7e1f754e1
CKSUM_CRATES+= vendor/lzma-sys
CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -396,10 +390,6 @@ CKSUM_CRATES+= vendor/stacker
CKSUMS+= cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e
CKSUMS+= 79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
-#CKSUM_CRATES+= vendor/libc
-#CKSUMS+= 080e0cf03b50874ba9d5082b314eabb0d253532dc4b13d8af095a0c78e0fba84
-#CKSUMS+= 1cca4f6c13bdda567d47ec4c83a1ea90d99dbe95b7de9478705b68630a13a8c7
-
CKSUM_CRATES+= vendor/openssl-src
CKSUMS+= 65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196
CKSUMS+= 7ff3cb1d807d93defda37c2ec01e01223295bcc3d20d218436c07e89cae80fe2
@@ -596,7 +586,7 @@ stage0-bootstrap: install
# rust i386 bootstraps are built for 8.0 and still depend on libstdc++.so.8.
# Pull in compat80 on 9.x and newer.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) && ${OPSYS_VERSION} >= 090000
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(OS_VERSION:M8.*)
BUILD_DEPENDS+= compat80>=0:../../emulators/compat80
.endif
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 060c4450dd1..38e8d2a6a62 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,140 +1,140 @@
-$NetBSD: distinfo,v 1.145 2022/05/23 15:13:00 jperkin Exp $
+$NetBSD: distinfo,v 1.146 2022/05/25 21:31:26 he Exp $
-BLAKE2s (rust-1.58.1-aarch64-apple-darwin.tar.gz) = 7b463dcd407f7281ad6f9418c26f4360685a6d49549165a7b76b41c1a4f39864
-SHA512 (rust-1.58.1-aarch64-apple-darwin.tar.gz) = 66e58a3efe201c1c954bf7f382c8a6a6a52399451ff6e3abd6ad797de32cbc8f01bb92f8512b93bacc2091554afd7de08f7900cfd68bd2e5cf99b68362e26de5
-Size (rust-1.58.1-aarch64-apple-darwin.tar.gz) = 288182624 bytes
-BLAKE2s (rust-1.58.1-aarch64-unknown-linux-gnu.tar.gz) = f74b7203274407945cef21aef5016f20c9f8971a5dc13c76ff112a6f5899fdda
-SHA512 (rust-1.58.1-aarch64-unknown-linux-gnu.tar.gz) = 031dfd5a089b6106cb7c4e6380184fd25cdff6ab66f55179addb21cbf10d20e1753a5ee9ae53be87a4c2cf73761705b037fba08e4bdb059a499111da8daa778a
-Size (rust-1.58.1-aarch64-unknown-linux-gnu.tar.gz) = 387893428 bytes
-BLAKE2s (rust-1.58.1-aarch64-unknown-netbsd.tar.gz) = c064fcb92927faa267a4645c99b1c4f32644f5f55bf4c093d7937832bcad1f01
-SHA512 (rust-1.58.1-aarch64-unknown-netbsd.tar.gz) = f448e56b5d07ff244d0de5899246b716f34866d43045fb56c3d7a73df6ebb103f65c25a09708a74cbb78d84f16d256af820f9bf126a45304608ff6e8579c1b68
-Size (rust-1.58.1-aarch64-unknown-netbsd.tar.gz) = 257274012 bytes
-BLAKE2s (rust-1.58.1-aarch64_be-unknown-netbsd.tar.gz) = d6e820922e2592c8b475b0e58d31bf085e1761be92192e7d32355a078c51144d
-SHA512 (rust-1.58.1-aarch64_be-unknown-netbsd.tar.gz) = c9f83f814c8cceaea9645dd082d742cdf972738a79d0d7323f60b56c1773a1d1c575e1a4266befdf05f95471e2514c2e4a4ad6d4e5ce9fe88203fc0551ff5bdf
-Size (rust-1.58.1-aarch64_be-unknown-netbsd.tar.gz) = 261603321 bytes
-BLAKE2s (rust-1.58.1-arm-unknown-linux-gnueabihf.tar.gz) = 7998c26ca07174595f7eede87ee4beccc1e8dc71f9a1570d53ec737c8a7cfddc
-SHA512 (rust-1.58.1-arm-unknown-linux-gnueabihf.tar.gz) = 7ab7b18b2ff5dc5c0f4bff439ab51b82a0c33f472daa6cd7bfe68c37f2914eabbd0e4c60eb2992edb04f41a19272f288c2e969c1afed2a6227831d6a8ec5788a
-Size (rust-1.58.1-arm-unknown-linux-gnueabihf.tar.gz) = 322826746 bytes
-BLAKE2s (rust-1.58.1-armv7-unknown-linux-gnueabihf.tar.gz) = 043c514019c2d5feede639b4bc1734718cf601db42468e196f5075bb62bc62bf
-SHA512 (rust-1.58.1-armv7-unknown-linux-gnueabihf.tar.gz) = 7c80d40d6262aa20b4e57bcff4572e4c04f6d1afe5fc1ade54d318c052dba76f40130a0d17d933eb87d2005a4f683fc8d8b75a61e78a99d8407e929eb6bebc76
-Size (rust-1.58.1-armv7-unknown-linux-gnueabihf.tar.gz) = 314545243 bytes
-BLAKE2s (rust-1.58.1-armv7-unknown-netbsd-eabihf.tar.gz) = 1f058ff663176c39968016286068d8c19e6035d23092de957351870a88d9d6fb
-SHA512 (rust-1.58.1-armv7-unknown-netbsd-eabihf.tar.gz) = fd39710313f571b71e7bb61d26ff14523bd2f73fa692d2820fc343903efaf062575c29d5ac0c8ca902cc236992a40708bca7406aaf3ff1b2e25cb1a8ca94cdd8
-Size (rust-1.58.1-armv7-unknown-netbsd-eabihf.tar.gz) = 221987249 bytes
-BLAKE2s (rust-1.58.1-i586-unknown-netbsd.tar.gz) = 8e3840d8ab28669ba5a20896a970dedf32d14d9796637bf0ecb48066c3da1e6c
-SHA512 (rust-1.58.1-i586-unknown-netbsd.tar.gz) = 9a2315bd9bba4a1b237145b35cbe989d190ccef541bf95d5f529e6e912ae5dba4dc4615e414d1c0b891e2480863f4931dc528fe60048ba5adf3193a3247d7c09
-Size (rust-1.58.1-i586-unknown-netbsd.tar.gz) = 265412577 bytes
-BLAKE2s (rust-1.58.1-i686-unknown-linux-gnu.tar.gz) = 37a1f82b11b2062093fd51b94ce940fbe11f4383f03bc0e578d5285b2e81b27a
-SHA512 (rust-1.58.1-i686-unknown-linux-gnu.tar.gz) = 739b24de687bc5194ea2a684d86cb19809c7c4f97c79e32eb3f6784fe81cb550ccbde00c5ed946f17338eb1efa6c2af93efd61cd3a115d0e72f52cfdda68ab64
-Size (rust-1.58.1-i686-unknown-linux-gnu.tar.gz) = 366141813 bytes
-BLAKE2s (rust-1.58.1-powerpc-unknown-netbsd.tar.gz) = eb189b704ce377af81f658b0e928ff61d497284f913d0013e422c28d274f48a6
-SHA512 (rust-1.58.1-powerpc-unknown-netbsd.tar.gz) = 71a11505215ccf0390b5c760f420e39b029931c629eb30c5f5a3210f1b833988052cad9e6f3781238fe74206919e10ac594a4c791c8613a98ca7a5852c3c7d87
-Size (rust-1.58.1-powerpc-unknown-netbsd.tar.gz) = 293120509 bytes
-BLAKE2s (rust-1.58.1-powerpc-unknown-netbsd90.tar.gz) = 03e34054741e891050865300e59875a20e8c73630a5ee83e779b5d397ef31cc7
-SHA512 (rust-1.58.1-powerpc-unknown-netbsd90.tar.gz) = c9977d7042bf93cf7afc7051d9f08028dfd29f74c5227f35c59183914ea8fb0a8ed54c67b350a0aaed379993671ed91d732d95e1f62eeb3a2b48d2c2f81be981
-Size (rust-1.58.1-powerpc-unknown-netbsd90.tar.gz) = 299431551 bytes
-BLAKE2s (rust-1.58.1-sparc64-unknown-netbsd.tar.gz) = 2db8078f2671b4e27f19aeac339e750453dd938da138bc9c56632aeffb4e6fbf
-SHA512 (rust-1.58.1-sparc64-unknown-netbsd.tar.gz) = 1a2a78adccfc6b898d62eacbcb199a9af3e4a02a9c354043ab1e79c94356a0b34ec7f1dc856db6db008e5b3a3b426582b7201785294cb4a299c7adc8d2088acf
-Size (rust-1.58.1-sparc64-unknown-netbsd.tar.gz) = 266251063 bytes
-BLAKE2s (rust-1.58.1-x86_64-apple-darwin.tar.gz) = 2e591f00ae0796015268ea5fd4dce7d48ada6154b62af8ccd310be87b8936679
-SHA512 (rust-1.58.1-x86_64-apple-darwin.tar.gz) = 59592e5787ff28c0a04aef6b073e183f652327eda96593d8c8098e6c6efb9e72549f6d073258139479608262677fb93b3280b9b1dee7f1243aef8eb5e880a2b5
-Size (rust-1.58.1-x86_64-apple-darwin.tar.gz) = 297755227 bytes
-BLAKE2s (rust-1.58.1-x86_64-unknown-freebsd.tar.gz) = 5d891f0778fa1f9dd3b99b4e8b9ed57c69adea7b3750b77a1ccaad0f589ca85d
-SHA512 (rust-1.58.1-x86_64-unknown-freebsd.tar.gz) = eb5bd1fe62bdb38951f91efe40823ba69e4499969ccb0ad27b9daba0d8ee578199635ca2e5aa291729abf0fc302dc6f896959c5768a6426bb971368e095d84e0
-Size (rust-1.58.1-x86_64-unknown-freebsd.tar.gz) = 286363073 bytes
BLAKE2s (rust-1.58.1-x86_64-unknown-illumos.tar.gz) = 867ef1783de52f6d6c59905d0fea90ac9db8ed623ed58956acba6af090521508
SHA512 (rust-1.58.1-x86_64-unknown-illumos.tar.gz) = 9649f840e8052f3d77c40938d9e651035f181f7ed71b2d4375dd911a270cb9e3d1d86f8ca62629e230e02612d6972729b5f3becca16af9eb3c53c4538a4a2f3b
Size (rust-1.58.1-x86_64-unknown-illumos.tar.gz) = 196899563 bytes
-BLAKE2s (rust-1.58.1-x86_64-unknown-linux-gnu.tar.gz) = b68f737b2cb57d3174a42b040cbe22fe5373533221c38516dc681e1266a09324
-SHA512 (rust-1.58.1-x86_64-unknown-linux-gnu.tar.gz) = 9f8c1fbe4124b7781de1fad63220ef2d34893d574a6e5b7660505184806383026396f5234c59e4b692f4035be2bbf6016fea21ebbcf57a600095c3289fa9edf5
-Size (rust-1.58.1-x86_64-unknown-linux-gnu.tar.gz) = 255371906 bytes
-BLAKE2s (rust-1.58.1-x86_64-unknown-netbsd.tar.gz) = 0b6da92181b66b78ccc1902ff74af7f4791eb4b1d46e8abb8ebdcacb01dc0f9a
-SHA512 (rust-1.58.1-x86_64-unknown-netbsd.tar.gz) = b483916fd28b004f5ada839328019d1a641c9c759fa27e878875f4d73e7336b450230420a0b1ba78d62a8c90e514c42dea38cececf36e0e0242af8338a44dd81
-Size (rust-1.58.1-x86_64-unknown-netbsd.tar.gz) = 268478476 bytes
-BLAKE2s (rust-std-1.58.1-aarch64-apple-darwin.tar.gz) = ba6de71c0e6991fd3eaa83bd17b17e2679cd243c3f6aaaf17789a50e9b911bc0
-SHA512 (rust-std-1.58.1-aarch64-apple-darwin.tar.gz) = 19a757943081d86267b059c731978587cd85d4f44c5b860e4b2afa7ee62f24e99b890e401852dbee48b5d9173260730b00c4ae79f04de15a954f7d872eab4aec
-Size (rust-std-1.58.1-aarch64-apple-darwin.tar.gz) = 37236715 bytes
-BLAKE2s (rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.gz) = db26e000cb2e5f138db2f6b4697790ea40d9ec9c26f68f47ae6d39cc6ad8893a
-SHA512 (rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.gz) = d0f62c0b99134b03f16e2f070cf8736fccb75c7a1b89786fb207bc46d64a34f31ef6c228a09ed474bd32308875207c8ab784c1b76b2e1ea60fc340964bb5c6f7
-Size (rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.gz) = 52409776 bytes
-BLAKE2s (rust-std-1.58.1-aarch64-unknown-netbsd.tar.gz) = 55bb5d9f91ac68d8ae6a09896b4b03bc1c6e1f374c562ab4cf442cb7d8d0fbec
-SHA512 (rust-std-1.58.1-aarch64-unknown-netbsd.tar.gz) = da86d885940fdb697bd82d2af862cea9e35971cc16ec602577db12cd982e4f0ba12767b6266ba69706c6489d3de5fff0fbca7cf6880e4bdec386c6fbc17b4b14
-Size (rust-std-1.58.1-aarch64-unknown-netbsd.tar.gz) = 32380384 bytes
-BLAKE2s (rust-std-1.58.1-aarch64_be-unknown-netbsd.tar.gz) = 07dcc2238a48bb1964e1e46f5c783fece66f58641e88e0c3b4df473902e13581
-SHA512 (rust-std-1.58.1-aarch64_be-unknown-netbsd.tar.gz) = 3e0e50ec1d31bf736509ee7d7edac73adc06d8ccdc6ebb2b258121b7abd684deb2bff4006ca2bb3e3a03c8c668ac6c1bb45e1c07e6ebd793ec482781d2ac209e
-Size (rust-std-1.58.1-aarch64_be-unknown-netbsd.tar.gz) = 32378720 bytes
-BLAKE2s (rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.gz) = f5ddf8dc3773098499fafb067659454a1e36458dff14a9f6cf1a79f42865f885
-SHA512 (rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.gz) = dae85be7d1aa0a4a94237cb33ce87f5093df8af8916705e11e971dc541931a38a6629cb366c879a901a4e3646ca5171e19fef8db64d9a78f9db57f05ef4dd6b7
-Size (rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.gz) = 33665401 bytes
-BLAKE2s (rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.gz) = d172ac5858164bf1e70478c3aa984dc3deb3d3dbdf74f2af41e94a49d42aca74
-SHA512 (rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.gz) = eb7edf79a57107ea65041f88127e03e4c7571df7f029274acef58fa634aab86c5d4574dc4a63528d18259478a5b2b7eb3fec5a61fa68391b37fa25f012a5ec79
-Size (rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.gz) = 35310557 bytes
-BLAKE2s (rust-std-1.58.1-armv7-unknown-netbsd-eabihf.tar.gz) = 44bfae7f68e08277a8dcb31ae3fa31ca3c5db25ad91400c51576a03453c6390c
-SHA512 (rust-std-1.58.1-armv7-unknown-netbsd-eabihf.tar.gz) = b1b6f770e5a4ca1a0e2f8731e52054413702b1a2ef595466df2ce4dc2f89ffe17519173e048d81a4bb9010d9c6be73e852117f38b238f5e891df688340da61f8
-Size (rust-std-1.58.1-armv7-unknown-netbsd-eabihf.tar.gz) = 31115196 bytes
-BLAKE2s (rust-std-1.58.1-i586-unknown-netbsd.tar.gz) = 9107a1bdeab52116ac64bec135a041eaca46eb43529c9dc845134abd3b3dd53c
-SHA512 (rust-std-1.58.1-i586-unknown-netbsd.tar.gz) = f56166b3e668cf44a59b9f8829827aa84423af35bca10f8ce1d4ac92f8f0bd3c3eed58670bc74eaaa864cb920458f560ed97dd2d807e7071bd173fcb9178c31c
-Size (rust-std-1.58.1-i586-unknown-netbsd.tar.gz) = 33217106 bytes
-BLAKE2s (rust-std-1.58.1-i686-unknown-linux-gnu.tar.gz) = 509df70cb4d1c1208bc0b53e73d35f72b8580228e3a43b8475e24a1f4a30effe
-SHA512 (rust-std-1.58.1-i686-unknown-linux-gnu.tar.gz) = 95f4e5094ec1680115bb62176ba36893f284564869af30f27c10b3979db0cca06bf4fb1f2cecf2f516b6761cb5dcd65b6f01cde9a9d5b5ce4f0989c96a4dfca7
-Size (rust-std-1.58.1-i686-unknown-linux-gnu.tar.gz) = 37251168 bytes
-BLAKE2s (rust-std-1.58.1-powerpc-unknown-netbsd.tar.gz) = 592cbea6c41b2bfcf9a9cea2909151cc4c95525941ef2e42deb5b214eccda3cc
-SHA512 (rust-std-1.58.1-powerpc-unknown-netbsd.tar.gz) = e96ad374eb47aecdd041a26b8f1f0dbe9ac1fecaeac5fce441660527aee129cacbc944e1cafa62aa6d47db74ec856a8d744ed9e007bf37365ab06c84de77d744
-Size (rust-std-1.58.1-powerpc-unknown-netbsd.tar.gz) = 29336514 bytes
-BLAKE2s (rust-std-1.58.1-powerpc-unknown-netbsd90.tar.gz) = 2ddb9bcee0efc712a53f80c5f78d4bbb645454dc9c956fa68df7241ac16d0192
-SHA512 (rust-std-1.58.1-powerpc-unknown-netbsd90.tar.gz) = 9b7adbaaa7f9a8ce31fb8e3a1d1c8a587ed0d3d8c3a2c77caa146f6af063fa8ef629f7c7a4a80a8582c6398d91fbad8f618c72380d6a742beff5dddde570b355
-Size (rust-std-1.58.1-powerpc-unknown-netbsd90.tar.gz) = 29330068 bytes
-BLAKE2s (rust-std-1.58.1-sparc64-unknown-netbsd.tar.gz) = 00a1d408861774de3187b68ac0a82c18572270134ef597e876d657c2c2096331
-SHA512 (rust-std-1.58.1-sparc64-unknown-netbsd.tar.gz) = 1df50868577dfca635d844a72ba8dc0f967cd2b3b33069c6777a2b673dd1b968a5e4cf42068d435928761ffafedc4a83c31ca302926a8741ea9ac156a00ca6c6
-Size (rust-std-1.58.1-sparc64-unknown-netbsd.tar.gz) = 29460105 bytes
-BLAKE2s (rust-std-1.58.1-x86_64-apple-darwin.tar.gz) = b5ae6df2b125dab7905078eb517b3cafa84aca4e5294e9f08b894acde521ee63
-SHA512 (rust-std-1.58.1-x86_64-apple-darwin.tar.gz) = ac570f2b836ae5fdb7e0e9b11d925382dedd148126063c52b09c45dbe5652826638a9276a5c7d6fd9296d863ea8f4df0b6d37a5ddd2453b77add8755301fac27
-Size (rust-std-1.58.1-x86_64-apple-darwin.tar.gz) = 38085459 bytes
-BLAKE2s (rust-std-1.58.1-x86_64-unknown-freebsd.tar.gz) = 6e1f65ef33cf78d2bb6ae2d58bafff949ec970120dce3f47a489985aecb8420e
-SHA512 (rust-std-1.58.1-x86_64-unknown-freebsd.tar.gz) = bad9eb2bfccc6b9fe3ee816a05cdf7641ac34e5c03cc8678357d879c119d8ced78465fc809f8658cbab447762ab3bde3a302b4a3b25a3aa29dad438de3353730
-Size (rust-std-1.58.1-x86_64-unknown-freebsd.tar.gz) = 39804275 bytes
-BLAKE2s (rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.gz) = 80f6747c52c607bce5dc68dcb727b01f960a40bd26bc0b490fd96dccae34e74b
-SHA512 (rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.gz) = 62a69aecb5423440240c96f1d1dadbd9150ec336d2865db29d850af6e2c8ccfd2e05a42144ba59602f9d5843ab51d4c6c533931c0b6b872667c8cdce307c254b
-Size (rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.gz) = 41281398 bytes
-BLAKE2s (rust-std-1.58.1-x86_64-unknown-netbsd.tar.gz) = 36c6f44794b84380f58e6b4ba93c848cac967eb80d9172e566866c5a93b40ae6
-SHA512 (rust-std-1.58.1-x86_64-unknown-netbsd.tar.gz) = ca533183f4bf8996adcc6390184f717e93450b99860abc89c4825a4eb202e5abe7ae20dc3c05efdabe85d31a258d4f5742c11c6560a426aef4aef2afaa642573
-Size (rust-std-1.58.1-x86_64-unknown-netbsd.tar.gz) = 37143711 bytes
-BLAKE2s (rustc-1.59.0-src.tar.gz) = f9d35a32c9219a816aa11575d45ea3ead87c5c8d10fe4677119fb8114094dd6b
-SHA512 (rustc-1.59.0-src.tar.gz) = 77e02226785e964750c89b8f27d6ee0546990919b8066889043145093b733e80edecb1fd81ae068e03943ded4692f28b2866cdaa8240a23f68968c235b0d1f8e
-Size (rustc-1.59.0-src.tar.gz) = 190229590 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a9a891b9c507958354fb819587d6d4b31ff83ce6
-SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
+BLAKE2s (rust-1.59.0-aarch64-apple-darwin.tar.gz) = 3b9fbd710b04c088470b04e8817217fb7f9549e42159ac9b0a210e746e53b20e
+SHA512 (rust-1.59.0-aarch64-apple-darwin.tar.gz) = b60feca7e1ca4ae9eb7550b82de475b47da8f14aa293c1e3e9c4321eed70f9a899003d567c870a81e5f5fdb88a74d1ff654a77fd6577a992170353037c05f963
+Size (rust-1.59.0-aarch64-apple-darwin.tar.gz) = 275637417 bytes
+BLAKE2s (rust-1.59.0-aarch64-unknown-linux-gnu.tar.gz) = b67afe86baacfd99d7bd1b3dc763f46ca22cc64cb1247a74089f88e16237199e
+SHA512 (rust-1.59.0-aarch64-unknown-linux-gnu.tar.gz) = 186d0d3b5c33c49735f8a50e5ffeb783821ca26bf646622e5d724ebbe698c39129000a568bc9dcc5cf521a9e72113bd853728bb76d31e442df92f5442f51cb2b
+Size (rust-1.59.0-aarch64-unknown-linux-gnu.tar.gz) = 370532745 bytes
+BLAKE2s (rust-1.59.0-aarch64-unknown-netbsd.tar.gz) = 7ed024fb3b122475dc984e99b16a8a3e04c5c93bf6e489c2111dde0036577704
+SHA512 (rust-1.59.0-aarch64-unknown-netbsd.tar.gz) = f6ace1fe718953b9da3e2174201bb62819823904552cdd3ec264fa798d2aabde1f6663598e6c6377a074912b7de6eada86450967dc9a3d41173e4043009563d0
+Size (rust-1.59.0-aarch64-unknown-netbsd.tar.gz) = 237460036 bytes
+BLAKE2s (rust-1.59.0-aarch64_be-unknown-netbsd.tar.gz) = 8f5e3660a56f349cbd6986bb68b462841fba98b771b273939b2343d9ac8da423
+SHA512 (rust-1.59.0-aarch64_be-unknown-netbsd.tar.gz) = 638fd5ba7efa811f32778b445c953b203029414abf11e9a9c9be14ac367d435c1147a7fefde7373ed95082532ca91917ee2d1706f39e0776e331e999bdae2087
+Size (rust-1.59.0-aarch64_be-unknown-netbsd.tar.gz) = 241627592 bytes
+BLAKE2s (rust-1.59.0-arm-unknown-linux-gnueabihf.tar.gz) = fe8e19b4797e6c2f8b152ce66ec6bedb9256697c06df11f86df1b48b0f3baffa
+SHA512 (rust-1.59.0-arm-unknown-linux-gnueabihf.tar.gz) = 1b8420cd74ecea78e82faf03a9c1c3283728c5c9a3b10446e00fbcd3d9591af27af43a3e44be100d7a6ecc547fa8c7d3c44d345939625a71f79b2d272bb5b94c
+Size (rust-1.59.0-arm-unknown-linux-gnueabihf.tar.gz) = 303555009 bytes
+BLAKE2s (rust-1.59.0-armv7-unknown-linux-gnueabihf.tar.gz) = f66b427e703fcd3fe461e628ceab8cfce408c8665869dd599ca1b95915f9656f
+SHA512 (rust-1.59.0-armv7-unknown-linux-gnueabihf.tar.gz) = 9b4106671d1167ec961aa5d12fd7bdab6ad0c1a9e38ef9b0c0fa74e856c0f5478230b0376f7a191fa7ab173bc9744a877db128c60eb06e9bfb94ade3e32e1283
+Size (rust-1.59.0-armv7-unknown-linux-gnueabihf.tar.gz) = 295408222 bytes
+BLAKE2s (rust-1.59.0-armv7-unknown-netbsd-eabihf.tar.gz) = c5553e9bab0b1e4f2613c05a1d7de2fcdf7fc858b62b3a42ebb8839dd8dd7ab7
+SHA512 (rust-1.59.0-armv7-unknown-netbsd-eabihf.tar.gz) = c47b1804a53488015b2daf288142d1f150c57fbd27131472f4c41f23662d46787df0ba84f212ee3e26e2b706b157a001042842724039de4f4e2c6ceccc701e6e
+Size (rust-1.59.0-armv7-unknown-netbsd-eabihf.tar.gz) = 209450244 bytes
+BLAKE2s (rust-1.59.0-i586-unknown-netbsd.tar.gz) = 72d2f88fa0d9a938b872548faf95eb7bd8b88637c04d78911907155ce992718f
+SHA512 (rust-1.59.0-i586-unknown-netbsd.tar.gz) = 3026a19b03b98ce99b94674aab2508780499c823eb51f41e309eda2f9ec921e627b2e8f90abcee5012cc3c702d9bc81b91980578b4d60a05c95b01cf0713993f
+Size (rust-1.59.0-i586-unknown-netbsd.tar.gz) = 245354781 bytes
+BLAKE2s (rust-1.59.0-i686-unknown-linux-gnu.tar.gz) = e295004dea4da31b8af4da687145018370d8ef17eca66c2268fac50fe2c4d746
+SHA512 (rust-1.59.0-i686-unknown-linux-gnu.tar.gz) = 114f2092b6290ed794b8e5becfebcd532c9324727d8a85e258b8d95ac2de29d368997b2953941ae268dcf3c5a440b1d86f25fb804b0690278935bd32b731f988
+Size (rust-1.59.0-i686-unknown-linux-gnu.tar.gz) = 349107211 bytes
+BLAKE2s (rust-1.59.0-powerpc-unknown-netbsd.tar.gz) = a24379ea60448f1fc45254129c68fbb8145b0fb8b4d843a83a8aaee79fb1ef81
+SHA512 (rust-1.59.0-powerpc-unknown-netbsd.tar.gz) = 1473df8264a7ec8b301941b740009676a5dce1205bf8a862ba69c609b430fa765ffdeeb3d7ee190879005470fbaacda9a081bbfeaeae7a7e8bc5f852038290e0
+Size (rust-1.59.0-powerpc-unknown-netbsd.tar.gz) = 272184245 bytes
+BLAKE2s (rust-1.59.0-powerpc-unknown-netbsd90.tar.gz) = 56e37971d490a4c50d16c9fa9ed98954d467a7fd6e49562e9b08bb6507f5766c
+SHA512 (rust-1.59.0-powerpc-unknown-netbsd90.tar.gz) = 48a88cdbd0227e31737c8689c1a52aeebd227b32cad33808fed8361170d181ccbe413145e076e5b02f37ed2414612f2a314c6e68779423a113c605db6fbacfcf
+Size (rust-1.59.0-powerpc-unknown-netbsd90.tar.gz) = 278494737 bytes
+BLAKE2s (rust-1.59.0-sparc64-unknown-netbsd.tar.gz) = c9fcdab084ecb10f838f74bdc88d82f15774d9658af9816f259adf6145117a29
+SHA512 (rust-1.59.0-sparc64-unknown-netbsd.tar.gz) = 1d8d4f93dce3acba63437ba4da0082d3baa3c1134531166d8a1102edb0f6cb43ffb4e90def670ac0c848ee226c3e0741a3d018f95aa654c3843178077aff677a
+Size (rust-1.59.0-sparc64-unknown-netbsd.tar.gz) = 245891630 bytes
+BLAKE2s (rust-1.59.0-x86_64-apple-darwin.tar.gz) = 365ae98bd77239b7a073dd5e8ddbda3e784d14d2f4ccc42f5ec30b00d126265e
+SHA512 (rust-1.59.0-x86_64-apple-darwin.tar.gz) = c360bc10f82e116fccab45e44c85ce55a2c6233badc3d0512b36748efcd12df9c0923f57f15e4bd80e163ea297eec05185f3693ee2e8708b67c59cb3014ba83a
+Size (rust-1.59.0-x86_64-apple-darwin.tar.gz) = 284198625 bytes
+BLAKE2s (rust-1.59.0-x86_64-unknown-freebsd.tar.gz) = f85add6bf0d4150957c6bcbe832fcf4da8f4a948c620d44c6c1d753113fe576d
+SHA512 (rust-1.59.0-x86_64-unknown-freebsd.tar.gz) = a170d55e2e80f7e5855caf6f52ed392630cfa076430886c462ea466f5a7a7c81d033a0764b9021de0e86fe105e22e797f67e85be47b87833b6d5133e486ac12d
+Size (rust-1.59.0-x86_64-unknown-freebsd.tar.gz) = 269933327 bytes
+BLAKE2s (rust-1.59.0-x86_64-unknown-linux-gnu.tar.gz) = f60b459ad7b6d8286641fb318499a3caa3fea0868da63587c229dedacd019732
+SHA512 (rust-1.59.0-x86_64-unknown-linux-gnu.tar.gz) = 460ed673cd260af28a3542bac95517e3a4e8bb63a029deecf5e5c671cd7784e73c9cabdcb0b7eb75a81a59d19671228d6a56093fd1712de7d9a76aeee43eca8a
+Size (rust-1.59.0-x86_64-unknown-linux-gnu.tar.gz) = 258629397 bytes
+BLAKE2s (rust-1.59.0-x86_64-unknown-netbsd.tar.gz) = ace2a39acae8a5ea8420296e7d87b8b1dab8c21165c17a332eb4ca705309389a
+SHA512 (rust-1.59.0-x86_64-unknown-netbsd.tar.gz) = a8a347ac68b61ea0bd324e3a14d55ff31de20fbb1496924c9cc8efab29f239d72388247b61dfddfe19111d00e5e1d737de197bacdd17998e52113bad7139ed47
+Size (rust-1.59.0-x86_64-unknown-netbsd.tar.gz) = 249024467 bytes
+BLAKE2s (rust-std-1.59.0-aarch64-apple-darwin.tar.gz) = f7e8c87703419519e79de519362f914481346c827aec0e41dce5eed29f0f0c0f
+SHA512 (rust-std-1.59.0-aarch64-apple-darwin.tar.gz) = 3116b92777f7060af4033dd7fda716c60c2f989e2ca7513bb7508a557bfb274e818bb9bf71c731af804c0e2a0c9cb0d84c7c8f632f0c1d4131854d4dea5e47d3
+Size (rust-std-1.59.0-aarch64-apple-darwin.tar.gz) = 38541530 bytes
+BLAKE2s (rust-std-1.59.0-aarch64-unknown-linux-gnu.tar.gz) = 9b6b4f181e441d08352ddacacb5805aa7656c21c90c992c25ae1eb48c4884229
+SHA512 (rust-std-1.59.0-aarch64-unknown-linux-gnu.tar.gz) = b72271e18cbdf3f42ae4cdd56531e0ec7d3b9b7037ae7683c3e91a9ca2766c370d13914da5d05cb7883cc6bd8f5edfed9e67259df7fd36a60feddb5c9fd4ec02
+Size (rust-std-1.59.0-aarch64-unknown-linux-gnu.tar.gz) = 53690069 bytes
+BLAKE2s (rust-std-1.59.0-aarch64-unknown-netbsd.tar.gz) = b0184654e7c222f4b9f22e1114d7689387375751b25a12eacca4f54cdf4f7bca
+SHA512 (rust-std-1.59.0-aarch64-unknown-netbsd.tar.gz) = d6eb76b5a4edfba58f0cf58a71f362b5077a344aa8d5ae7e659e1802e9384c814fba7bf8d58823cf0d0ee9e85bbd05ca46b297e56e9bad5c9ae745c8c5f93c99
+Size (rust-std-1.59.0-aarch64-unknown-netbsd.tar.gz) = 33598596 bytes
+BLAKE2s (rust-std-1.59.0-aarch64_be-unknown-netbsd.tar.gz) = ff36bb5df89a6c1bc464f125903280b9dd8694e34bebef3de950d5c8c21a3e1b
+SHA512 (rust-std-1.59.0-aarch64_be-unknown-netbsd.tar.gz) = 862b34f0fe080ae7534db41136661a46db802c7eb6472727ef9515c18600e741ade71b480852d29d864071f9cd092c2bc9fd7d400f0731a67411425a41d9179e
+Size (rust-std-1.59.0-aarch64_be-unknown-netbsd.tar.gz) = 33601284 bytes
+BLAKE2s (rust-std-1.59.0-arm-unknown-linux-gnueabihf.tar.gz) = 45db31882eee026422803dd1561dc270dd531207ce7d3813d81688e779b0417f
+SHA512 (rust-std-1.59.0-arm-unknown-linux-gnueabihf.tar.gz) = bb6e79f4eec6714cc3241de6282f7444f2a8dd027da0702050bafcd94a2d579f8796e2ba2d15587b3a2941c918a17c7544da11d5b08dfcb019254a6e61cf6ab0
+Size (rust-std-1.59.0-arm-unknown-linux-gnueabihf.tar.gz) = 34676100 bytes
+BLAKE2s (rust-std-1.59.0-armv7-unknown-linux-gnueabihf.tar.gz) = 5010d5e365cef7754c75071503bf57753d59407b4399f306bcbf8e2a84bb1230
+SHA512 (rust-std-1.59.0-armv7-unknown-linux-gnueabihf.tar.gz) = e542c535af5f7cd5d4ab7957fdadb3d8aa4e8f1531ace61070c52885d0aa41f8c13bca8a4928c9c0c42269ead952bcaca56f94e6dfa9113d870c019413e89bd7
+Size (rust-std-1.59.0-armv7-unknown-linux-gnueabihf.tar.gz) = 36509100 bytes
+BLAKE2s (rust-std-1.59.0-armv7-unknown-netbsd-eabihf.tar.gz) = 12744fb922c058f81711ffcaa41f047f90fd4c3684f7e64e1a6093afa3edd627
+SHA512 (rust-std-1.59.0-armv7-unknown-netbsd-eabihf.tar.gz) = 196a173014887e490c44ede94fbd035a6a5514ee569847d3582e21ab81c4eba608d6ca1a0cb81f0b0855808cd60700ba6846209dc0657f8b8fa2273838788d58
+Size (rust-std-1.59.0-armv7-unknown-netbsd-eabihf.tar.gz) = 32109210 bytes
+BLAKE2s (rust-std-1.59.0-i586-unknown-netbsd.tar.gz) = 6ba522ac9182c7c5f831f8232796d8c6455ecc3d3d2c465f0feab69b52902715
+SHA512 (rust-std-1.59.0-i586-unknown-netbsd.tar.gz) = cbd63d0bbd86f2a56661cd0a5b7edb845e9533f6f4cbd284c4733f09f5f9a05a36d65eaed0bc1c2cf028ccc6d5ee26bf7895af1bc48f49a39ba2d3c60e0df145
+Size (rust-std-1.59.0-i586-unknown-netbsd.tar.gz) = 34276271 bytes
+BLAKE2s (rust-std-1.59.0-i686-unknown-linux-gnu.tar.gz) = 24e04f873312d4f290b7a34fc2d663f8b3b5754d302d1bdbde27409c1fe48080
+SHA512 (rust-std-1.59.0-i686-unknown-linux-gnu.tar.gz) = 768633cc980445bb736c74e3ea90fbf38fd237c20d9481d9127933d6ef02b9e9ec80ce4d60f661a1be3df311b924417e9c90681afc07235838d52a9025e071da
+Size (rust-std-1.59.0-i686-unknown-linux-gnu.tar.gz) = 38538390 bytes
+BLAKE2s (rust-std-1.59.0-powerpc-unknown-netbsd.tar.gz) = adb7006f3292d281a0569d7dffd962ed1afe0577756d26fd5f6660c27fb95542
+SHA512 (rust-std-1.59.0-powerpc-unknown-netbsd.tar.gz) = dfe64ef939487dbc04e6fba7608eebfed9dce56e9dee14288e4e6c55157246ad1fbaf2aacb704a7e969bb6a3e24fbc4b7ca72e88531616b6f685771f205d6966
+Size (rust-std-1.59.0-powerpc-unknown-netbsd.tar.gz) = 30124266 bytes
+BLAKE2s (rust-std-1.59.0-powerpc-unknown-netbsd90.tar.gz) = 4b627fdaac2571e9af8b306d5438413a19d2f67d4b165f8792113cc242c96d56
+SHA512 (rust-std-1.59.0-powerpc-unknown-netbsd90.tar.gz) = 5440644acfba3cb4c2b20890468e6bc968333a8f612882de288728be880de66552041a08e1e4164f7048d1b013278575340b7f0e43063f7173580649253faaf2
+Size (rust-std-1.59.0-powerpc-unknown-netbsd90.tar.gz) = 30119916 bytes
+BLAKE2s (rust-std-1.59.0-sparc64-unknown-netbsd.tar.gz) = 96b4a1d2d137fbbff671d63500c293dbbd1e2cdffa33e595db4e4ebc2f5ce140
+SHA512 (rust-std-1.59.0-sparc64-unknown-netbsd.tar.gz) = ae2c8b8fef6fe20d1866ac984f8e3cdceb662cc72b40124aa8084accb2491ccf6069c69c427227d0a7bdc55508d957d6b1db52e4255b0974c2c0782e6c65c6f8
+Size (rust-std-1.59.0-sparc64-unknown-netbsd.tar.gz) = 30269195 bytes
+BLAKE2s (rust-std-1.59.0-x86_64-apple-darwin.tar.gz) = 377df8d64efbe53eaac1eb27c73c264d46c626907e8e4a48e4b311ef278fb550
+SHA512 (rust-std-1.59.0-x86_64-apple-darwin.tar.gz) = 2621a4ec985c18da55a74a1d3b17eebd73e579295b7c42f45c62970ce374e9ec552be1aad9e9b92990bd8cf2c4ac1e63e4afd6cd96b54a8eb6f9333de74d1c00
+Size (rust-std-1.59.0-x86_64-apple-darwin.tar.gz) = 39328167 bytes
+BLAKE2s (rust-std-1.59.0-x86_64-unknown-freebsd.tar.gz) = 80e11aaee968d2bee4c969e23e87a4b3a1bfb20b42c8b35e1adf0a5f302d2e61
+SHA512 (rust-std-1.59.0-x86_64-unknown-freebsd.tar.gz) = 0cc583677fbf7c24eb3a255fa84dab6a67140bcac3294c366e94a4887fcc52b360e62cfdbf29d478e72962b4e749a5b8a7e995cc51bdea6f96a46fa15949a805
+Size (rust-std-1.59.0-x86_64-unknown-freebsd.tar.gz) = 41067268 bytes
+BLAKE2s (rust-std-1.59.0-x86_64-unknown-linux-gnu.tar.gz) = 95cbd6edf55c997471c9f0dc63a2f2f19729eed150b77f5faa092e291d0a890c
+SHA512 (rust-std-1.59.0-x86_64-unknown-linux-gnu.tar.gz) = 2e4319c2798e820e1485cf167030fd3dec95864afe4d40bbf912b77dfec7d136fceb2cdbc68f8c032045562a152163940bf1aab0a99705f852f9bc82a458b944
+Size (rust-std-1.59.0-x86_64-unknown-linux-gnu.tar.gz) = 42505644 bytes
+BLAKE2s (rust-std-1.59.0-x86_64-unknown-netbsd.tar.gz) = 97a84b68cbd43bc6b836339ef678e2aae5e40433997a0d1228f2261fe637a4d1
+SHA512 (rust-std-1.59.0-x86_64-unknown-netbsd.tar.gz) = 5e11b1067d514376fbe05fefdd915aebff14e42876940b8593231b45a202d3bac3f8575b1047c21464092cc9c4d664af2da299387e3b43125f741a8656205eea
+Size (rust-std-1.59.0-x86_64-unknown-netbsd.tar.gz) = 38349557 bytes
+BLAKE2s (rustc-1.60.0-src.tar.gz) = 4b8bef4271345a46fb72965a67f5a371ef148f3e9439dea77e9484d34102be67
+SHA512 (rustc-1.60.0-src.tar.gz) = ae626482287949eb73a5467245b8e21b7624713a29d4bbdf1c1e1232e10f5497ba3435427e08df4fd5d2277c456213e5d04529e841d50924a4211fdb8c6acfd0
+Size (rustc-1.60.0-src.tar.gz) = 202376973 bytes
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 3c19dae8c19578860d3369253ef6bb35772db821
+SHA1 (patch-compiler_rustc__llvm_build.rs) = cdbed7372d12d1404119867eceaafe43ae8acb6d
SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = acad7e2b0bbeb85f6453aeee74a0f2ca253d6a9b
SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = efae710b37c089702802c3d5aa678d1cc5f88cc2
-SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 8f1b5ced49fa66a646327a19f9eb0501fa2b01c7
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = ee9668aecdaa509a8fb8c3d799e0ce5077f6a11c
SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 18e3cb9f32c4170679459b2c63c856abe0fac6a3
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 94b6bf51fac39d3e28a261855fd747ad1e96b286
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 505192b8fec0cc0a167c27a2121acb3c1acef53c
SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
-SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e919325e99b
-SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
-SHA1 (patch-src_bootstrap_bootstrap.py) = 84af2ffa57ae1b68d12c6b9d3ce181a13576992c
-SHA1 (patch-src_bootstrap_builder.rs) = bddcd392de816b69f5e1a13c2b6423b95387da39
-SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
-SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
-SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
-SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
+SHA1 (patch-library_std_src_sys_unix_thread.rs) = ac9b172915163ac5652d06cfc4ccdd1f8b08e651
+SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8
+SHA1 (patch-src_bootstrap_bootstrap.py) = 4c19629832d9cb2ae1fcb1e995b69b6161185cff
+SHA1 (patch-src_bootstrap_builder.rs) = 05616bb7a707e3c5f7e9e7fabb43a141f465a303
+SHA1 (patch-src_bootstrap_compile.rs) = 31c10251b2294d9fdbd02600934b13325c5be0cb
+SHA1 (patch-src_bootstrap_lib.rs) = d44981439e4ed1c04286933f7b63aab42ccd4645
+SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = fb1b9ea0c81bf96abb5a88fcb523631c42cd8f14
+SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = fef9f055d2b918c4480fbf8ee68e259197490a0f
SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 26982203916ad601599c7a3e05867e4dad742ae1
-SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15
-SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = dc9b405b41882bc7c74e08b8188acab3d4aed4ad
+SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 99b2fea3b8d59aa97c2cd4bb630eb8c768203dd9
+SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = d6c16e9f009b51d3bfc7ae712ac9099654308845
SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906
SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = 8174664b7bce2e60e690bc20ab688606b60c55dc
SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 5236eda97fa686b5661e4e5832102e2f010def7b
SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546
SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = c5f4217146483389fe664c8cbe70796ca601ab4d
-SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 6ac2ed2694d3afccc3a3475e6d21b8877cf46a02
-SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
-SHA1 (patch-vendor_libc-0.2.108_src_unix_bsd_netbsdlike_netbsd_mod.rs) = a75d2729b96bd8a68c3ecf2e03f2daace737a229
-SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
+SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 16d02570960aaa11571ced4437a7dad52e63aa7d
+SHA1 (patch-vendor_cc_src_lib.rs) = 84d81272ad8b120e092e231913c5c18d7a70378d
+SHA1 (patch-vendor_libc-0.2.112_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c4d703bc084d8506afd8fed1428f59e578936f77
+SHA1 (patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 90144e0a6a91db61c42308181a25bdf5ff60e670
+SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 351e213fc07b0dc7c35d70d6a0c2ecc6b5b9056e
+SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 15c552165d5310d5b218a777a12af44b601a2d57
SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
SHA1 (patch-vendor_openssl-src_src_lib.rs) = e62697daa7e7fa3d7b89f338c3a26066b93d7b34
-SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
-SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs) = 6abed2c934b546f9b92504e3db49f9bd63aa19f8
SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
-SHA1 (patch-vendor_target-lexicon_src_targets.rs) = e0c67288516ff8d379d6d1e7b05d4ab86f9ac0a7
+SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 226c19a52589789b55584f73a585eab35aa5e55c
diff --git a/lang/rust/do-cross.mk b/lang/rust/do-cross.mk
index 769c1da85d9..3649f8bad91 100644
--- a/lang/rust/do-cross.mk
+++ b/lang/rust/do-cross.mk
@@ -2,6 +2,7 @@
# 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+= sparc64
@@ -11,15 +12,18 @@ SHORT_TARGETS+= arm64
SHORT_TARGETS+= arm64_be
SHORT_TARGETS+= i386
+# 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.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
@@ -77,16 +81,16 @@ do-${st}:
else \
TT=${TGT.${st}}; \
fi; \
- distdir=${WRKDIR}/rustc-${VERSION}-src/build/dist; \
+ distdir=${WRKDIR}/rustc-${V_NOREV}-src/build/dist; \
for comp in rust rust-std; do \
- src=$${distdir}/$${comp}-${VERSION}-${TGT.${st}}.tar.gz; \
- tgt=dist/$${comp}-${VERSION}-$${TT}.tar.gz; \
+ 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-${VERSION}.tar.gz; \
+ 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; \
diff --git a/lang/rust/options.mk b/lang/rust/options.mk
index c4f28060a07..bd52d638e45 100644
--- a/lang/rust/options.mk
+++ b/lang/rust/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2022/05/05 10:27:33 jperkin Exp $
+# $NetBSD: options.mk,v 1.24 2022/05/25 21:31:26 he Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
.if ${OPSYS} != "SunOS"
PKG_SUPPORTED_OPTIONS+= rust-llvm
# There may be compatibility issues with base LLVM.
-. if !empty(HAVE_LLVM) || !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
+. if !empty(HAVE_LLVM)
PKG_SUGGESTED_OPTIONS+= rust-llvm
. endif
.endif
diff --git a/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
index 68e1dd61846..dd47419cd5d 100644
--- a/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
+++ b/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.5 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.6 2022/05/25 21:31:26 he Exp $
Do not use @rpath on Darwin.
--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ compiler/rustc_codegen_ssa/src/back/linker.rs
-@@ -326,7 +326,7 @@ impl<'a> GccLinker<'a> {
+@@ -327,7 +327,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.debugging_opts.osx_rpath_install_name {
diff --git a/lang/rust/patches/patch-compiler_rustc__llvm_build.rs b/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
index 987f836b7e2..7502ed8f8e8 100644
--- a/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
+++ b/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.6 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.7 2022/05/25 21:31:26 he Exp $
Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
--- compiler/rustc_llvm/build.rs.orig 2021-11-01 07:17:29.000000000 +0000
+++ compiler/rustc_llvm/build.rs
-@@ -268,7 +268,13 @@ fn main() {
+@@ -269,7 +269,13 @@ fn main() {
"c++"
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
// NetBSD uses a separate library when relocation is required
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
index 1b018b8a294..4692d4fe247 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.7 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.8 2022/05/25 21:31:26 he Exp $
Add i586(pentium) and aarch64_be targets.
--- compiler/rustc_target/src/spec/mod.rs.orig 2021-03-23 16:15:10.000000000 +0000
+++ compiler/rustc_target/src/spec/mod.rs
-@@ -816,9 +816,11 @@ supported_targets! {
+@@ -884,9 +884,11 @@ supported_targets! {
("powerpc-unknown-openbsd", powerpc_unknown_openbsd),
("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
diff --git a/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs b/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
index 889995b6b90..7fd0bdf1f2d 100644
--- a/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
+++ b/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.7 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.8 2022/05/25 21:31:26 he Exp $
Fix stack-clash on SunOS.
--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000
+++ library/std/src/sys/unix/thread.rs
-@@ -470,7 +470,7 @@ pub mod guard {
+@@ -493,7 +493,7 @@ pub mod guard {
let page_size = os::page_size();
PAGE_SIZE.store(page_size, Ordering::Relaxed);
diff --git a/lang/rust/patches/patch-library_unwind_build.rs b/lang/rust/patches/patch-library_unwind_build.rs
index d9558ab331f..c520ad0c442 100644
--- a/lang/rust/patches/patch-library_unwind_build.rs
+++ b/lang/rust/patches/patch-library_unwind_build.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-library_unwind_build.rs,v 1.7 2022/01/21 23:20:36 he Exp $
+$NetBSD: patch-library_unwind_build.rs,v 1.8 2022/05/25 21:31:26 he Exp $
Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
--- library/unwind/build.rs.orig 2020-10-07 07:53:22.000000000 +0000
+++ library/unwind/build.rs
-@@ -20,7 +20,9 @@ fn main() {
+@@ -23,7 +23,9 @@ fn main() {
} else if target.contains("freebsd") {
println!("cargo:rustc-link-lib=gcc_s");
} else if target.contains("netbsd") {
diff --git a/lang/rust/patches/patch-src_bootstrap_bootstrap.py b/lang/rust/patches/patch-src_bootstrap_bootstrap.py
index 339a346e8e1..e244efce63d 100644
--- a/lang/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/lang/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.10 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.11 2022/05/25 21:31:26 he Exp $
Use `uname -p` on NetBSD, as that is reliable and sensible there.
Handle earmv7hf for NetBSD.
@@ -6,7 +6,7 @@ Default to non-verbose compilation.
--- src/bootstrap/bootstrap.py.orig 2021-02-10 17:36:44.000000000 +0000
+++ src/bootstrap/bootstrap.py
-@@ -218,6 +218,11 @@ def default_build_triple(verbose):
+@@ -259,6 +259,11 @@ def default_build_triple(verbose):
'OpenBSD': 'unknown-openbsd'
}
@@ -18,7 +18,7 @@ Default to non-verbose compilation.
# Consider the direct transformation first and then the special cases
if ostype in ostype_mapper:
ostype = ostype_mapper[ostype]
-@@ -271,6 +276,7 @@ def default_build_triple(verbose):
+@@ -312,6 +317,7 @@ def default_build_triple(verbose):
cputype_mapper = {
'BePC': 'i686',
'aarch64': 'aarch64',
@@ -26,7 +26,7 @@ Default to non-verbose compilation.
'amd64': 'x86_64',
'arm64': 'aarch64',
'i386': 'i686',
-@@ -309,10 +315,12 @@ def default_build_triple(verbose):
+@@ -350,10 +356,12 @@ def default_build_triple(verbose):
ostype = 'linux-androideabi'
else:
ostype += 'eabihf'
@@ -40,7 +40,7 @@ Default to non-verbose compilation.
else:
ostype += 'eabihf'
elif cputype == 'mips':
-@@ -980,7 +988,7 @@ class RustBuild(object):
+@@ -1034,7 +1042,7 @@ class RustBuild(object):
self.cargo()))
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
diff --git a/lang/rust/patches/patch-src_bootstrap_builder.rs b/lang/rust/patches/patch-src_bootstrap_builder.rs
index 6e97c9831c9..ce6098e25b0 100644
--- a/lang/rust/patches/patch-src_bootstrap_builder.rs
+++ b/lang/rust/patches/patch-src_bootstrap_builder.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_bootstrap_builder.rs,v 1.20 2022/04/15 14:00:37 he Exp $
+$NetBSD: patch-src_bootstrap_builder.rs,v 1.21 2022/05/25 21:31:26 he Exp $
Do not install 'src'.
Use @PREFIX@, not $ORIGIN in rpath.
@@ -7,7 +7,7 @@ Fix RPATH for pkgsrc.
--- src/bootstrap/builder.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ src/bootstrap/builder.rs
-@@ -520,7 +520,6 @@ impl<'a> Builder<'a> {
+@@ -617,7 +617,6 @@ impl<'a> Builder<'a> {
install::Clippy,
install::Miri,
install::Analysis,
@@ -15,7 +15,7 @@ Fix RPATH for pkgsrc.
install::Rustc
),
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest, run::BumpStage0),
-@@ -1186,7 +1185,7 @@ impl<'a> Builder<'a> {
+@@ -1277,7 +1276,7 @@ impl<'a> Builder<'a> {
Some("-Wl,-rpath,@loader_path/../lib")
} else if !target.contains("windows") {
rustflags.arg("-Clink-args=-Wl,-z,origin");
diff --git a/lang/rust/patches/patch-src_bootstrap_compile.rs b/lang/rust/patches/patch-src_bootstrap_compile.rs
index be3379bea27..6d91edae1c3 100644
--- a/lang/rust/patches/patch-src_bootstrap_compile.rs
+++ b/lang/rust/patches/patch-src_bootstrap_compile.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_bootstrap_compile.rs,v 1.6 2022/01/21 23:20:36 he Exp $
+$NetBSD: patch-src_bootstrap_compile.rs,v 1.7 2022/05/25 21:31:26 he Exp $
On Darwin, do not use @rpath for internal libraries.
--- src/bootstrap/compile.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ src/bootstrap/compile.rs
-@@ -414,7 +414,7 @@ fn copy_sanitizers(
+@@ -417,7 +417,7 @@ fn copy_sanitizers(
if target == "x86_64-apple-darwin" || target == "aarch64-apple-darwin" {
// Update the library’s install name to reflect that it has has been renamed.
diff --git a/lang/rust/patches/patch-src_bootstrap_lib.rs b/lang/rust/patches/patch-src_bootstrap_lib.rs
index ce405de8da2..8c031dec8f2 100644
--- a/lang/rust/patches/patch-src_bootstrap_lib.rs
+++ b/lang/rust/patches/patch-src_bootstrap_lib.rs
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_bootstrap_lib.rs,v 1.13 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-src_bootstrap_lib.rs,v 1.14 2022/05/25 21:31:26 he Exp $
Don't filter out optimization flags.
FreeBSD has a particular C++ runtime library name
--- src/bootstrap/lib.rs.orig 2021-09-06 18:42:35.000000000 +0000
+++ src/bootstrap/lib.rs
-@@ -954,14 +954,13 @@ impl Build {
+@@ -957,14 +957,13 @@ impl Build {
.args()
.iter()
.map(|s| s.to_string_lossy().into_owned())
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index ee24ea2957e..64bdf105a52 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.8 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.9 2022/05/25 21:31:26 he 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
-@@ -939,11 +939,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+@@ -1025,11 +1025,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
# (this is a variable that CrossCompile sets on recursive invocations)
endif()
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake b/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
index e1fade835f9..067e5c19ba6 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.9 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.10 2022/05/25 21:31:26 he Exp $
On Darwin, use correct install-name for shared libraries.
--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig 2020-09-22 17:14:20.000000000 +0000
+++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
-@@ -2117,7 +2117,7 @@ function(llvm_setup_rpath name)
+@@ -2143,7 +2143,7 @@ function(llvm_setup_rpath name)
endif()
if (APPLE)
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp b/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
index 7a24600262c..b44c75aafaa 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.7 2022/01/21 23:20:36 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.8 2022/05/25 21:31:26 he 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
+@@ -591,7 +591,7 @@ static void DumpAnnotatedInput(raw_ostre
unsigned LineCount = InputFileText.count('\n');
if (InputFileEnd[-1] != '\n')
++LineCount;
diff --git a/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs b/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
index 7c4816d4f70..0078c36176e 100644
--- a/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
+++ b/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.9 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.10 2022/05/25 21:31:26 he 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 2018-10-24 20:01:28.000000000 +0000
+++ src/tools/cargo/src/cargo/core/profiles.rs
-@@ -720,6 +720,9 @@ impl Profile {
+@@ -754,6 +754,9 @@ impl Profile {
debuginfo: Some(2),
debug_assertions: true,
overflow_checks: true,
diff --git a/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs b/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs
index cc6c204867a..3d73183435b 100644
--- a/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs
+++ b/lang/rust/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs
@@ -1,8 +1,8 @@
-$NetBSD: patch-vendor_backtrace_src_symbolize_gimli_elf.rs,v 1.2 2022/05/23 15:13:00 jperkin Exp $
+$NetBSD: patch-vendor_backtrace_src_symbolize_gimli_elf.rs,v 1.3 2022/05/25 21:31:26 he Exp $
Make NetBSD also find its debug libraries, if present.
---- vendor/backtrace/src/symbolize/gimli/elf.rs.orig 2022-02-23 05:34:24.000000000 +0000
+--- vendor/backtrace/src/symbolize/gimli/elf.rs.orig 2022-04-04 11:10:55.000000000 +0000
+++ vendor/backtrace/src/symbolize/gimli/elf.rs
@@ -276,11 +276,16 @@ fn decompress_zlib(input: &[u8], output:
}
@@ -16,7 +16,7 @@ Make NetBSD also find its debug libraries, if present.
fn debug_path_exists() -> bool {
cfg_if::cfg_if! {
- if #[cfg(any(target_os = "freebsd", target_os = "linux"))] {
-+ if #[cfg(any(target_os = "freebsd",
++ if #[cfg(any(target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "linux"))] {
use core::sync::atomic::{AtomicU8, Ordering};
diff --git a/lang/rust/patches/patch-vendor_cc_src_lib.rs b/lang/rust/patches/patch-vendor_cc_src_lib.rs
index 4af9b7f58c0..c26880d0dc7 100644
--- a/lang/rust/patches/patch-vendor_cc_src_lib.rs
+++ b/lang/rust/patches/patch-vendor_cc_src_lib.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-vendor_cc_src_lib.rs,v 1.5 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-vendor_cc_src_lib.rs,v 1.6 2022/05/25 21:31:26 he Exp $
Add aarch64_eb.
--- vendor/cc/src/lib.rs.orig 2021-07-26 15:20:38.000000000 +0000
+++ vendor/cc/src/lib.rs
-@@ -2382,6 +2382,7 @@ impl Build {
+@@ -2504,6 +2504,7 @@ impl Build {
"aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
"aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
"aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.108_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-vendor_libc-0.2.112_src_unix_bsd_netbsdlike_netbsd_mod.rs
index e26e6d6f94e..e503b927c85 100644
--- a/lang/rust/patches/patch-vendor_libc-0.2.108_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/lang/rust/patches/patch-vendor_libc-0.2.112_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-vendor_libc-0.2.108_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2022/05/18 20:57:28 he Exp $
+$NetBSD: patch-vendor_libc-0.2.112_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2022/05/25 21:31:26 he Exp $
Copy execinfo function definitions from openbsd's mod.rs.
---- vendor/libc-0.2.108/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-02-23 05:34:25.000000000 +0000
-+++ vendor/libc-0.2.108/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2700,6 +2700,22 @@ extern "C" {
+--- vendor/libc-0.2.112/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-04-04 11:10:56.000000000 +0000
++++ vendor/libc-0.2.112/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2721,6 +2721,22 @@ extern "C" {
pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
}
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 00000000000..fefbce8fc56
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,29 @@
+$NetBSD: patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2022/05/25 21:31:26 he Exp $
+
+Copy execinfo function definitions from openbsd's mod.rs.
+
+--- vendor/libc-0.2.116/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-04-04 11:10:56.000000000 +0000
++++ vendor/libc-0.2.116/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2787,6 +2787,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;
diff --git a/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 00000000000..10145fa8008
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,29 @@
+$NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2022/05/25 21:31:26 he Exp $
+
+Copy execinfo function definitions from openbsd's mod.rs.
+
+--- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-05-10 20:59:35.217463943 +0000
++++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2787,6 +2787,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;
diff --git a/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs b/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
index 04f67e766a6..0f2b9e4390e 100644
--- a/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
+++ b/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.7 2022/03/01 16:06:39 he Exp $
+$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.8 2022/05/25 21:31:26 he Exp $
Fix xattr build.
--- vendor/libc/src/unix/solarish/mod.rs.orig 2019-05-20 13:47:24.000000000 +0000
+++ vendor/libc/src/unix/solarish/mod.rs
-@@ -1215,6 +1215,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+@@ -1315,6 +1315,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;
diff --git a/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
deleted file mode 100644
index 91d2eb9253f..00000000000
--- a/lang/rust/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.3 2021/11/20 16:09:46 he 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/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs
deleted file mode 100644
index 268b9576b71..00000000000
--- a/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs,v 1.3 2021/11/20 16:09:46 he Exp $
-
-Add aarch64_be NetBSD target.
-
---- vendor/rustc-ap-rustc_target/src/spec/mod.rs.orig 2021-03-23 16:54:53.000000000 +0000
-+++ vendor/rustc-ap-rustc_target/src/spec/mod.rs
-@@ -777,6 +777,7 @@ supported_targets! {
- ("powerpc-unknown-openbsd", powerpc_unknown_openbsd),
-
- ("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
-+ ("aarch64_be-unknown-netbsd", aarch64_be_unknown_netbsd),
- ("armv6-unknown-netbsd-eabihf", armv6_unknown_netbsd_eabihf),
- ("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
- ("i686-unknown-netbsd", i686_unknown_netbsd),
diff --git a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
index 02a5f15f787..9d55eaa0eed 100644
--- a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
+++ b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.5 2022/01/21 23:20:36 he Exp $
+$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.6 2022/05/25 21:31:26 he Exp $
Add aarch64_eb for NetBSD.
--- vendor/target-lexicon/src/targets.rs.orig 2021-05-03 21:35:46.000000000 +0000
+++ vendor/target-lexicon/src/targets.rs
-@@ -1287,6 +1287,7 @@ mod tests {
+@@ -1297,6 +1297,7 @@ mod tests {
"aarch64-unknown-linux-gnu_ilp32",
"aarch64-unknown-linux-musl",
"aarch64-unknown-netbsd",
diff --git a/lang/rust/platform.mk b/lang/rust/platform.mk
index 53d48a2bd5a..6f20c76e60a 100644
--- a/lang/rust/platform.mk
+++ b/lang/rust/platform.mk
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.14 2022/04/30 21:02:39 nia Exp $
+# $NetBSD: platform.mk,v 1.15 2022/05/25 21:31:26 he Exp $
# This file encodes whether a given platform has support for rust.
@@ -11,19 +11,17 @@
. for rust_arch in aarch64 earmv7hf i386 powerpc sparc64 x86_64
. for rust_os in Darwin FreeBSD Linux NetBSD SunOS
+. if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[0-7].*)
RUST_PLATFORMS+= ${rust_os}-*-${rust_arch}
+. endif
. endfor
. endfor
-. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
-PLATFORM_SUPPORTS_RUST?= no
-. else
-. for rust_platform in ${RUST_PLATFORMS}
-. if !empty(MACHINE_PLATFORM:M${rust_platform})
+. for rust_platform in ${RUST_PLATFORMS}
+. if !empty(MACHINE_PLATFORM:M${rust_platform})
PLATFORM_SUPPORTS_RUST= yes
-. endif
-. endfor
+. endif
+. endfor
PLATFORM_SUPPORTS_RUST?= no
-. endif
.endif # !defined(PLATFORM_SUPPORTS_RUST)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 00:33:46 +0000