From 4bbd8544fa47b00e70a849871afce5c727a3ecbd Mon Sep 17 00:00:00 2001 From: he Date: Wed, 26 May 2021 09:21:39 +0000 Subject: [PATCH] Update lang/rust to version 1.51.0. Pkgsrc changes: * Add support for the big-endian arm64 NetBSD target (aarch64_be). * On NetBSD/i386, use the i586 (pentium) bootstrap kit variant in preference to i686. * Adjust patches, re-compute line offsets, re-compute crate checksums. * Remove a patch which was either integrated upstream and/or no longer applies. * Bump bootstraps to 1.50.0. * Move conditionals until after bsd.prefs.mk so that they work... * Default to "dist" build target if cross-compiling, but allow also to override via rust.BUILD_TARGET. * Allow overriding MAKE_JOBS_SAFE via rust.MAKE_JOBS_SAFE if you want a different trade-off between occasional breakage and performance. * Adjust platform.mk according to work already done in wip/rust/ * Add a patch to optimize the install.sh script used to install binary bootstraps to not do so many forks; use case/esac and parameter expansion instead of grep, sed and cut. * Drop building documentation for the binary bootstrap kits. This will also impact the lang/rust-bin package. For full documentation, build or install lang/rust as a package. Upstream changes: Version 1.51.0 (2021-03-25) ============================ Language -------- - [You can now parameterize items such as functions, traits, and `struct`s by constant values in addition to by types and lifetimes.][79135] Also known as "const generics" E.g. you can now write the following. Note: Only values of primitive integers, `bool`, or `char` types are currently permitted. ```rust struct GenericArray { inner: [T; LENGTH] } impl GenericArray { const fn last(&self) -> Option<&T> { if LENGTH == 0 { None } else { Some(&self.inner[LENGTH - 1]) } } } ``` Compiler -------- - [Added the `-Csplit-debuginfo` codegen option for macOS platforms.][79570] This option controls whether debug information is split across multiple files or packed into a single file. **Note** This option is unstable on other platforms. - [Added tier 3\* support for `aarch64_be-unknown-linux-gnu`, `aarch64-unknown-linux-gnu_ilp32`, and `aarch64_be-unknown-linux-gnu_ilp32` targets.][81455] - [Added tier 3 support for `i386-unknown-linux-gnu` and `i486-unknown-linux-gnu` targets.][80662] - [The `target-cpu=native` option will now detect individual features of CPUs.][80749] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [`Box::downcast` is now also implemented for any `dyn Any + Send + Sync` object.][80945] - [`str` now implements `AsMut`.][80279] - [`u64` and `u128` now implement `From`.][79502] - [`Error` is now implemented for `&T` where `T` implements `Error`.][75180] - [`Poll::{map_ok, map_err}` are now implemented for `Poll>>`.][80968] - [`unsigned_abs` is now implemented for all signed integer types.][80959] - [`io::Empty` now implements `io::Seek`.][78044] - [`rc::Weak` and `sync::Weak`'s methods such as `as_ptr` are now implemented for `T: ?Sized` types.][80764] - [`Div` and `Rem` by their `NonZero` variant is now implemented for all unsigned integers.][79134] Stabilized APIs --------------- - [`Arc::decrement_strong_count`] - [`Arc::increment_strong_count`] - [`Once::call_once_force`] - [`Peekable::next_if_eq`] - [`Peekable::next_if`] - [`Seek::stream_position`] - [`array::IntoIter`] - [`panic::panic_any`] - [`ptr::addr_of!`] - [`ptr::addr_of_mut!`] - [`slice::fill_with`] - [`slice::split_inclusive_mut`] - [`slice::split_inclusive`] - [`slice::strip_prefix`] - [`slice::strip_suffix`] - [`str::split_inclusive`] - [`sync::OnceState`] - [`task::Wake`] - [`VecDeque::range`] - [`VecDeque::range_mut`] Cargo ----- - [Added the `split-debuginfo` profile option to control the -Csplit-debuginfo codegen option.][cargo/9112] - [Added the `resolver` field to `Cargo.toml` to enable the new feature resolver and CLI option behavior.][cargo/8997] Version 2 of the feature resolver will try to avoid unifying features of dependencies where that unification could be unwanted. Such as using the same dependency with a `std` feature in a build scripts and proc-macros, while using the `no-std` feature in the final binary. See the [Cargo book documentation][feature-resolver@2.0] for more information on the feature. Rustdoc ------- - [Rustdoc will now include documentation for methods available from _nested_ `Deref` traits.][80653] - [You can now provide a `--default-theme` flag which sets the default theme to use for documentation.][79642] Various improvements to intra-doc links: - [You can link to non-path primitives such as `slice`.][80181] - [You can link to associated items.][74489] - [You can now include generic parameters when linking to items, like `Vec`.][76934] Misc ---- - [You can now pass `--include-ignored` to tests (e.g. with `cargo test -- --include-ignored`) to include testing tests marked `#[ignore]`.][80053] Compatibility Notes ------------------- - [WASI platforms no longer use the `wasm-bindgen` ABI, and instead use the wasm32 ABI.][79998] - [`rustc` no longer promotes division, modulo and indexing operations to `const` that could fail.][80579] - [The minimum version of glibc for the following platforms has been bumped to version 2.31 for the distributed artifacts.][81521] - `armv5te-unknown-linux-gnueabi` - `sparc64-unknown-linux-gnu` - `thumbv7neon-unknown-linux-gnueabihf` - `armv7-unknown-linux-gnueabi` - `x86_64-unknown-linux-gnux32` - [`atomic::spin_loop_hint` has been deprecated.][80966] It's recommended to use `hint::spin_loop` instead. Internal Only ------------- - [Consistently avoid constructing optimized MIR when not doing codegen][80718] [79135]: https://github.com/rust-lang/rust/pull/79135 [74489]: https://github.com/rust-lang/rust/pull/74489 [76934]: https://github.com/rust-lang/rust/pull/76934 [79570]: https://github.com/rust-lang/rust/pull/79570 [80181]: https://github.com/rust-lang/rust/pull/80181 [79642]: https://github.com/rust-lang/rust/pull/79642 [80945]: https://github.com/rust-lang/rust/pull/80945 [80279]: https://github.com/rust-lang/rust/pull/80279 [80053]: https://github.com/rust-lang/rust/pull/80053 [79502]: https://github.com/rust-lang/rust/pull/79502 [75180]: https://github.com/rust-lang/rust/pull/75180 [79135]: https://github.com/rust-lang/rust/pull/79135 [81521]: https://github.com/rust-lang/rust/pull/81521 [80968]: https://github.com/rust-lang/rust/pull/80968 [80959]: https://github.com/rust-lang/rust/pull/80959 [80718]: https://github.com/rust-lang/rust/pull/80718 [80653]: https://github.com/rust-lang/rust/pull/80653 [80579]: https://github.com/rust-lang/rust/pull/80579 [79998]: https://github.com/rust-lang/rust/pull/79998 [78044]: https://github.com/rust-lang/rust/pull/78044 [81455]: https://github.com/rust-lang/rust/pull/81455 [80764]: https://github.com/rust-lang/rust/pull/80764 [80749]: https://github.com/rust-lang/rust/pull/80749 [80662]: https://github.com/rust-lang/rust/pull/80662 [79134]: https://github.com/rust-lang/rust/pull/79134 [80966]: https://github.com/rust-lang/rust/pull/80966 [cargo/8997]: https://github.com/rust-lang/cargo/pull/8997 [cargo/9112]: https://github.com/rust-lang/cargo/pull/9112 [feature-resolver@2.0]: https://doc.rust-lang.org/nightly/cargo/reference/features.html#feature-resolver-version-2 [`Once::call_once_force`]: https://doc.rust-lang.org/stable/std/sync/struct.Once.html#method.call_once_force [`sync::OnceState`]: https://doc.rust-lang.org/stable/std/sync/struct.OnceState.html [`panic::panic_any`]: https://doc.rust-lang.org/stable/std/panic/fn.panic_any.html [`slice::strip_prefix`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.strip_prefix [`slice::strip_suffix`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.strip_prefix [`Arc::increment_strong_count`]: https://doc.rust-lang.org/nightly/std/sync/struct.Arc.html#method.increment_strong_count [`Arc::decrement_strong_count`]: https://doc.rust-lang.org/nightly/std/sync/struct.Arc.html#method.decrement_strong_count [`slice::fill_with`]: https://doc.rust-lang.org/nightly/std/primitive.slice.html#method.fill_with [`ptr::addr_of!`]: https://doc.rust-lang.org/nightly/std/ptr/macro.addr_of.html [`ptr::addr_of_mut!`]: https://doc.rust-lang.org/nightly/std/ptr/macro.addr_of_mut.html [`array::IntoIter`]: https://doc.rust-lang.org/nightly/std/array/struct.IntoIter.html [`slice::split_inclusive`]: https://doc.rust-lang.org/nightly/std/primitive.slice.html#method.split_inclusive [`slice::split_inclusive_mut`]: https://doc.rust-lang.org/nightly/std/primitive.slice.html#method.split_inclusive_mut [`str::split_inclusive`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_inclusive [`task::Wake`]: https://doc.rust-lang.org/nightly/std/task/trait.Wake.html [`Seek::stream_position`]: https://doc.rust-lang.org/nightly/std/io/trait.Seek.html#method.stream_position [`Peekable::next_if`]: https://doc.rust-lang.org/nightly/std/iter/struct.Peekable.html#method.next_if [`Peekable::next_if_eq`]: https://doc.rust-lang.org/nightly/std/iter/struct.Peekable.html#method.next_if_eq [`VecDeque::range`]: https://doc.rust-lang.org/nightly/std/collections/struct.VecDeque.html#method.range [`VecDeque::range_mut`]: https://doc.rust-lang.org/nightly/std/collections/struct.VecDeque.html#method.range_mut --- lang/rust/Makefile | 98 +++--- lang/rust/cross.mk | 5 +- lang/rust/distinfo | 305 +++++++++--------- ...t_src_spec_aarch64__be__unknown__netbsd.rs | 27 ++ ...__target_src_spec_i586__unknown__netbsd.rs | 11 +- ...tch-compiler_rustc__target_src_spec_mod.rs | 11 +- ...__target_src_spec_x86__64__sun__solaris.rs | 14 - .../patch-library_std_src_sys_unix_thread.rs | 6 +- .../patches/patch-library_unwind_build.rs | 8 +- .../patches/patch-src_bootstrap_bootstrap.py | 16 +- .../patches/patch-src_bootstrap_builder.rs | 19 +- .../patches/patch-src_bootstrap_compile.rs | 22 +- lang/rust/patches/patch-src_bootstrap_lib.rs | 8 +- ...patch-src_llvm-project_llvm_CMakeLists.txt | 6 +- ...vm_include_llvm_Analysis_ConstantFolding.h | 6 +- ...project_llvm_utils_FileCheck_FileCheck.cpp | 6 +- ...src_tools_cargo_src_cargo_core_profiles.rs | 6 +- ...h-src_tools_cargo_tests_testsuite_build.rs | 10 +- .../patch-src_tools_rls_rls_src_cmd.rs | 8 +- .../patch-src_tools_rls_rls_src_server_io.rs | 10 +- ...c_tools_rust-installer_install-template.sh | 150 ++++++++- .../patches/patch-vendor_cc-1.0.60_src_lib.rs | 15 + lang/rust/patches/patch-vendor_cc_src_lib.rs | 14 + ...patch-vendor_libc_src_unix_solarish_mod.rs | 6 +- .../patches/patch-vendor_lzma-sys_config.h | 6 +- .../patch-vendor_openssl-src_src_lib.rs | 18 +- ...t_src_spec_aarch64__be__unknown__netbsd.rs | 27 ++ ...dor_rustc-ap-rustc__target_src_spec_mod.rs | 14 + .../patches/patch-vendor_stacker_src_lib.rs | 6 +- ...patch-vendor_target-lexicon_src_targets.rs | 14 + lang/rust/platform.mk | 32 +- 31 files changed, 591 insertions(+), 313 deletions(-) create mode 100644 lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs delete mode 100644 lang/rust/patches/patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs create mode 100644 lang/rust/patches/patch-vendor_cc-1.0.60_src_lib.rs create mode 100644 lang/rust/patches/patch-vendor_cc_src_lib.rs create mode 100644 lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs create mode 100644 lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs create mode 100644 lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 32939198baec..2793c9d65cb2 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.237 2021/05/24 19:52:35 wiz Exp $ +# $NetBSD: Makefile,v 1.238 2021/05/26 09:21:39 he Exp $ -DISTNAME= rustc-1.50.0-src +DISTNAME= rustc-1.51.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} -PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ @@ -19,7 +18,7 @@ GCC_REQD+= 5 USE_GCC_RUNTIME= yes USE_LANGUAGES= c c++11 USE_LIBTOOL= yes -USE_TOOLS+= bash ggrep gmake perl:build pkg-config +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. @@ -46,20 +45,6 @@ CONFIGURE_ARGS+= --disable-dist-src CONFIGURE_ARGS+= --disable-llvm-static-stdcpp CONFIGURE_ARGS+= --disable-ninja -# Include (optional) settings to cross-build rust -.include "cross.mk" - -.if !empty(rust.BUILD_TARGET) -BUILD_TARGET= ${rust.BUILD_TARGET} -.endif - -.if !empty(TARGET) -# Use "dist" build target for cross compile of bootstrap -BUILD_TARGET?= dist -.else -BUILD_TARGET?= build -.endif - # Getting RPATH with $ORIGIN into bootstrap may be troublesome, so # uncommenting the LD_LIBRARY_PATH setting may be required to run # the bootstrap @@ -84,6 +69,35 @@ CHECK_SSP_SUPPORTED= no .include "../../mk/bsd.prefs.mk" +# Allow overriding MAKE_JOBS_SAFE +# some may chose to mostly build faster, +# and deal with any failures due to deadlocks +.if !empty(rust.MAKE_JOBS_SAFE) +. if ${rust.MAKE_JOBS_SAFE:tl} == "yes" +MAKE_JOBS_SAFE= yes +. endif +.endif + +.if !empty(rust.BUILD_TARGET) +BUILD_TARGET= ${rust.BUILD_TARGET} +.endif + +# Include (optional) settings to cross-build rust +.include "cross.mk" + +.if !empty(TARGET) +# Use "dist" build target for cross compile of bootstrap +BUILD_TARGET?= dist +.else +BUILD_TARGET?= build +.endif + +.if ${BUILD_TARGET} == "dist" +# Reduce size of bootstrap: +CONFIGURE_ARGS+= --disable-docs +CONFIGURE_ARGS+= --disable-compiler-docs +.endif + .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \ !empty(TARGET:Marmv7-unknown-netbsd-eabihf) @@ -135,7 +149,7 @@ CONFIGURE_ARGS+= --set llvm.targets="ARM;X86" # If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel. # \todo Consider avoiding setting this on netbsd-9 past the fix. . if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*} -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE?= no . endif # Open PRs @@ -161,7 +175,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -169,7 +183,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -177,7 +191,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -185,7 +199,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -193,7 +207,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -201,7 +215,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -209,7 +223,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -222,7 +236,7 @@ pre-build-fix: # 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.49.0 +RUST_STAGE0_VER= 1.50.0 RUST_ARCH:= x86_64-unknown-illumos RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ @@ -236,7 +250,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -244,8 +258,8 @@ 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.49.0 -RUST_ARCH= i686-unknown-netbsd +RUST_STAGE0_VER= 1.50.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 SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} @@ -261,7 +275,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -269,7 +283,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.49.0 +RUST_STAGE0_VER= 1.50.0 RUST_ARCH= powerpc-unknown-netbsd # Cross-built against NetBSD 9.0 @@ -293,7 +307,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -303,7 +317,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.49.0 +RUST_STAGE0_VER= 1.50.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 @@ -314,7 +328,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.49.0 +RUST_STAGE0_VER= 1.50.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} @@ -354,8 +368,16 @@ SUBST_VARS.rpath= PREFIX # updating and verification. # CKSUM_CRATES+= vendor/libc -CKSUMS+= 0134ce769d06b1b1f50ad15d1aa7bd8d44bcd2f66c6318dd906de8bc4a4044c7 -CKSUMS+= 1107d18986be8af262f7a7c14761a9faf0228dc8a773379b9d7e8d2f711b3f37 +CKSUMS+= 8d7ddc8dd25a9404f9181a49438d9506c676cfd4b6fa21dbe5c1f9969abc4b91 +CKSUMS+= f147be95b04ea1303171dff46c5a66b08cd47ccd0a4c346d5bcec7a8aaac3fc4 + +CKSUM_CRATES+= vendor/cc-1.0.60 +CKSUMS+= 903c5f2f5dd0cc7d04f99f605a95e6abde8b38156fd4e73eefc58493f55a4e5a +CKSUMS+= e45520f4dda532240e4ec28af550fcb76f44090361f273bebcf0d07dc0807885 + +CKSUM_CRATES+= vendor/rustc-ap-rustc_target +CKSUMS+= ab83c62fab6927a47fc3d15c02eec41174ea9f3e8dce5c53adab613d48918bc5 +CKSUMS+= 01f50edc3845bd03459d525444150d03f57cdb479de2668a71c1538adf3d340a CKSUM_CRATES+= vendor/lzma-sys CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9 @@ -371,7 +393,7 @@ CKSUMS+= 9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12 CKSUM_CRATES+= vendor/openssl-src CKSUMS+= 03dcdaac7de880b860ecfe859ba2ac3e46c8f46a7bf948aa674147eebee421b0 -CKSUMS+= 90456c77ade1702fbf116d9cdc57c0c8dba5f059f591d3dffc9b54c7a7088be8 +CKSUMS+= 580a24c5a739e688e488498b8a34e27a3284c3160e6d3aaff711a80774c35c48 SUBST_CLASSES+= cksum SUBST_STAGE.cksum= pre-configure diff --git a/lang/rust/cross.mk b/lang/rust/cross.mk index 5be0d21957ef..a4f6d8085d2a 100644 --- a/lang/rust/cross.mk +++ b/lang/rust/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.5 2021/04/20 11:54:32 he Exp $ +# $NetBSD: cross.mk,v 1.6 2021/05/26 09:21:39 he Exp $ # These settings may be used to cross-build rust. # @@ -17,6 +17,7 @@ #CROSS_ROOT= /u/macppc #CROSS_ROOT= /u/9.0-macppc #CROSS_ROOT= /u/evbarm64 +#CROSS_ROOT= /u/evbarm64eb #CROSS_ROOT= /u/i386 #CROSS_ROOT= / #MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT} @@ -27,6 +28,7 @@ #GNU_CROSS_TARGET= i486--netbsdelf #GNU_CROSS_TARGET= powerpc--netbsd #GNU_CROSS_TARGET= aarch64--netbsd +#GNU_CROSS_TARGET= aarch64_be--netbsd #MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET} # To cross-build rust, you need to specify @@ -37,6 +39,7 @@ #TARGET= sparc64-unknown-netbsd #TARGET= powerpc-unknown-netbsd #TARGET= aarch64-unknown-netbsd +#TARGET= aarch64_be-unknown-netbsd #TARGET= i686-unknown-netbsd #TARGET= i586-unknown-netbsd # diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 636dbf6aaaf5..b12e8564c725 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,160 +1,165 @@ -$NetBSD: distinfo,v 1.131 2021/04/23 11:41:55 nia Exp $ +$NetBSD: distinfo,v 1.132 2021/05/26 09:21:39 he Exp $ -SHA1 (rust-1.49.0-aarch64-apple-darwin.tar.gz) = f2ca6aa0d3f84a1ea96d6a4875ea435a38fce7c0 -RMD160 (rust-1.49.0-aarch64-apple-darwin.tar.gz) = eee9b9744e41161e9f1231229b5a8c2050ea77df -SHA512 (rust-1.49.0-aarch64-apple-darwin.tar.gz) = 5a324d85534dc462815278abb8c2b358f406bbad782b1d94a3ba478a75035604b1830ad2fa5ded923ccc995f32150f16658ca881b9fc059d8042b59c392fdf3c -Size (rust-1.49.0-aarch64-apple-darwin.tar.gz) = 235741580 bytes -SHA1 (rust-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = a3cd5b0714d0e838ed888a1d846f4d522f078280 -RMD160 (rust-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = e09dd62e2518ffcbf7901b92f941af4f0f0ea7d0 -SHA512 (rust-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = 1b92a24ac07c84b9d3c9bd4c0464aefce414f50e5af203f800c2f442150df3265d7ae261ab6cb8726d4bce622f631237b2ca45be9e3da30cf3f85bddb33478dd -Size (rust-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = 306996334 bytes -SHA1 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 97804c99b787a54bf16c0c13665eb74cab6c7bba -RMD160 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 5940c473d0655dc50efc10d2a7dc4bb7c0b85590 -SHA512 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = f8d430fcc2d3b83e37d01c49932395eb3e3882e7e593238fdbab363f98418bd50b478054197760c1fd549cd7df87b34325678f26bee6e9b7ff21d159551af7af -Size (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 259213852 bytes -SHA1 (rust-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = e4918200406165644b661346fc59010b430342e9 -RMD160 (rust-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 65b21bd4ec567c5a2f921bd0f4f1f3436bd8086f -SHA512 (rust-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 875c611268ba8a0c162caf0ff9f18d79a0ee83bf082b7fd3a10844e719c250e2fe2db1cad615639e38a5cc67adceeb3624a74a4f815c98f208a36e9fe9b0099b -Size (rust-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 272416908 bytes -SHA1 (rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = d5117ef0254f6e74b3235a23cb39b36e077f748a -RMD160 (rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = d55f226a6273cd367ee3d32c4681a0080ebd2118 -SHA512 (rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = 4210dcd3eaf4fb60ad0d3345a63ea4cfeb0bc12a439b45076ee50c22b7dc5be602227da71059162f0111a972a38072d0763eb1af010b2bcfc63047225282d3a6 -Size (rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = 263338829 bytes -SHA1 (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = c6ff63c7e8f4c1c23eaf6e70ff5dd9cc598a4bc7 -RMD160 (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 2177ba63fd60de56fe804b86fc48f7e853fe390c -SHA512 (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 956209fbbc7555a83a2ab4bdc191f5d12f3dbe3b978794be819269e98af054231f57ec2c754944a42d957057c52566f6a40e1aae119b1badb8a3d2237f461a43 -Size (rust-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 241080722 bytes -SHA1 (rust-1.49.0-i686-unknown-linux-gnu.tar.gz) = de8d345b47dcacff306b39bd594d4bbd2fc0fb24 -RMD160 (rust-1.49.0-i686-unknown-linux-gnu.tar.gz) = 0cb4b449e91d645f13d45281f3c60642d6a2f9c8 -SHA512 (rust-1.49.0-i686-unknown-linux-gnu.tar.gz) = 12b42537b4b0b02bf97634c8c4e14465b6039638b40d086e1b42c9df64909a0051b0f67aec477349168943cdf37739de44309ee91f6535958c22c165adbf987a -Size (rust-1.49.0-i686-unknown-linux-gnu.tar.gz) = 327377966 bytes -SHA1 (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 4f8a5261751fd43495b0e0ef19d8cef448a9004e -RMD160 (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 9515ae688b8ca3ae878470f5cec23370473ab51e -SHA512 (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 334570b5a9a88490f3151db36a5821709602f527cab0a0839ccf5c2b5a1bcdd096d65a4d165d88d350589fc7d61330bd613c114d8896685bb727780d6ea7b0b9 -Size (rust-1.49.0-i686-unknown-netbsd.tar.gz) = 274232619 bytes -SHA1 (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = 169de8bf536b080722a9f0aad54c895070f8d96b -RMD160 (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = 21c1aea54155266c63856f17458a7502a88792dc -SHA512 (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = e87b125c01d52b87216db84d5fdb1b795f68a6870663a3cc8f6af2f788103e785da761def347f0b0084cca3c39ddb7feb4999a6cff27b23031433e1b65d1ad8c -Size (rust-1.49.0-powerpc-unknown-netbsd.tar.gz) = 288330635 bytes -SHA1 (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 164af24fc8f8e261deb6e7ff393752a9786c5bc4 -RMD160 (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 80db1a2ca0c9de6f718891e42607fcf831bb6107 -SHA512 (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 4499ab421d7a790bb5af115d5777e419c4ff635a5e919fe6969407ae5bd64e5ec6a91631bf1f457e0c947ce79ee2db39f4e8fe3760bb275743bca89055b98e7c -Size (rust-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 293526410 bytes -SHA1 (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = 1ff0966777105cd733e67dc227d960a19d4777d8 -RMD160 (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = 70fd99278ff73ce4a30a5c43890ac2406b18f294 -SHA512 (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = b28eabfbbcd7e7e895a102f66a7d87fd0daf88049c7f1ef69247d0288b11482d22d6c9ac09ac89b113ce372550e066fb9350db349a0cf31363848bd5289ac3b9 -Size (rust-1.49.0-sparc64-unknown-netbsd.tar.gz) = 275214266 bytes -SHA1 (rust-1.49.0-x86_64-apple-darwin.tar.gz) = 81f697111f1d981a8d3596b11e3e64283bc1546f -RMD160 (rust-1.49.0-x86_64-apple-darwin.tar.gz) = 9ecae8f9636061769d05b4459095a217d1627619 -SHA512 (rust-1.49.0-x86_64-apple-darwin.tar.gz) = dd2c9375571880d3fabcd61161d06169c365cfb9dabfd023e728b2e6affdb8101d631edc9ae00b7d7fdc9c2babb578f71acfacd1780877c56572ad3beb19b524 -Size (rust-1.49.0-x86_64-apple-darwin.tar.gz) = 262777607 bytes -SHA1 (rust-1.49.0-x86_64-unknown-freebsd.tar.gz) = 0a529d605715930e9004cf6a693b19ae2dec19c1 -RMD160 (rust-1.49.0-x86_64-unknown-freebsd.tar.gz) = 5ca3f5f805c5fd1525eda8b276b2834f5e51f495 -SHA512 (rust-1.49.0-x86_64-unknown-freebsd.tar.gz) = c7768ae65fe0bcce7fc3d915618c8034da93cd213a45c3ae16501060a959a29527c0b2e4ca7ecd84f907797dc1683f361614daf096334451a6812e889aaeee48 -Size (rust-1.49.0-x86_64-unknown-freebsd.tar.gz) = 218268823 bytes -SHA1 (rust-1.49.0-x86_64-unknown-illumos.tar.gz) = 5fe74da4ad2f63561bf9129b20dc058b83fc2ce9 -RMD160 (rust-1.49.0-x86_64-unknown-illumos.tar.gz) = 5c38b2eb78689cb83147a6ceb45c82dc1f909958 -SHA512 (rust-1.49.0-x86_64-unknown-illumos.tar.gz) = a49dbe2fafa604323c634196fc48bbe274808087bd9940db79f65101db4d70e46ab3d1e078e6e9d4ccab2093f6cf16fc379405c10af539ebdc6084ebfbf2d6fd -Size (rust-1.49.0-x86_64-unknown-illumos.tar.gz) = 196387210 bytes -SHA1 (rust-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 44c79f6113770cf25d05ebb4acad6494d39e6a2f -RMD160 (rust-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 7513ac2472723a02491a3ddc7934c16edfe7423c -SHA512 (rust-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 334c3ae93009c54390289a6d5266538d080e6b4909dd4cb2073a1eb0349eb7287d052305d4130e7ea39fdfee013e29080d6dc4b9335fa717bcc0c9f87849eece -Size (rust-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 250314423 bytes -SHA1 (rust-1.49.0-x86_64-unknown-netbsd.tar.gz) = c43ab0af19139dc8cc36cc007f5cdf0b0bb1ea02 -RMD160 (rust-1.49.0-x86_64-unknown-netbsd.tar.gz) = d0043d669b55fa9f40497cf143afa2870e2275ef -SHA512 (rust-1.49.0-x86_64-unknown-netbsd.tar.gz) = aa9b4a6da515bf5d4c2bd0f96c5f3589a4e48b2f612285cb0c1c867aa492f23fda0fe832874ed515784bf4c4b833e3b9b5946af12fdd4a0346453b4e726f2e8b -Size (rust-1.49.0-x86_64-unknown-netbsd.tar.gz) = 227006885 bytes -SHA1 (rust-std-1.49.0-aarch64-apple-darwin.tar.gz) = e37e29375203fad3ffe9bda92952e6b354aa63b9 -RMD160 (rust-std-1.49.0-aarch64-apple-darwin.tar.gz) = 1ddc99fbc545b2e601d507d90b5f88bd8cdb1a32 -SHA512 (rust-std-1.49.0-aarch64-apple-darwin.tar.gz) = 72fa2936413124daa2b49a7998aa63cdd1ca068cf224eed14815f9a5b4b1d4fe602845cffec3d61a98eb5c0d6ce06c57efe4a2684699a9726db7cb1225610083 -Size (rust-std-1.49.0-aarch64-apple-darwin.tar.gz) = 27145897 bytes -SHA1 (rust-std-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = ccb07c8077e510831debcd8b55313db852dfff88 -RMD160 (rust-std-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = 7c9815094aa43d568f5884b90b2b005f97fffa52 -SHA512 (rust-std-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = d08d561b832e2e294e1ff5c64bad84e40aed0f42b28773e977ce4a47e1334482c0851393484b24e0d4c6287966c75d87c4b210c9385e1d731b92765895c29a7d -Size (rust-std-1.49.0-aarch64-unknown-linux-gnu.tar.gz) = 28421680 bytes -SHA1 (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = bec960b56661b1f039233ef75e33f304b6ed176d -RMD160 (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = f3e70c1b7fa0c75ea668860c3f7c546ad7a97fee -SHA512 (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = 6a1f31fc63cf6d0b10b461e2dc003b75f87763c586f1fa81e1bc102c2f50fc856f2cd42529bd4d3d0d668a16747cf0568ccf6e1b70c1e01c61a1617caaf03f0c -Size (rust-std-1.49.0-aarch64-unknown-netbsd.tar.gz) = 24786839 bytes -SHA1 (rust-std-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 391a105f57e5728c232040ffe16615077c91cabd -RMD160 (rust-std-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 78ee088ab8061e25c2e0c8abc9526cfad14f9c2f -SHA512 (rust-std-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 134f83b4e68cb94737893ff5380cda5063aa04120f5cd0409c4498b70467e252529d89363e2cfc4d443936f5b29ee5103549acb7b449c0db63e1ebaa27e94f4f -Size (rust-std-1.49.0-arm-unknown-linux-gnueabihf.tar.gz) = 28417445 bytes -SHA1 (rust-std-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = e743d245d63a183cc46de354138cc1533e192819 -RMD160 (rust-std-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = c06a8ac9f3f176f3461704e48c099128e4d5ad07 -SHA512 (rust-std-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = 46ef543f99daf5e170de04a85389861a1d69b98c653a50de410558154b2495e86d9653fce7fc1dc9029e986b575728aab8fc4f60ef60965c039b56a35b47e8e7 -Size (rust-std-1.49.0-armv7-unknown-linux-gnueabihf.tar.gz) = 28623618 bytes -SHA1 (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = b3f82f4c2d2af9be54eb10e313f053d7443107d2 -RMD160 (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 58468d07240e082820d844bb2bd512f5e293a7e3 -SHA512 (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 7057a8a850e0ed8a70acaee032b3ca69c9dd3f708da5e2124d160e8942e59a63faa6a6782cc2565b9edb7056e37ae06509c281c07aa48a8921663db04ad55d84 -Size (rust-std-1.49.0-armv7-unknown-netbsd-eabihf.tar.gz) = 24763715 bytes -SHA1 (rust-std-1.49.0-i686-unknown-linux-gnu.tar.gz) = fe9e151fb962dcec0a6a5e1ede2d91a31ebc32d4 -RMD160 (rust-std-1.49.0-i686-unknown-linux-gnu.tar.gz) = b3dad53f90b1a0695ddf7dbdb203f1f428487422 -SHA512 (rust-std-1.49.0-i686-unknown-linux-gnu.tar.gz) = 17915db60012b5697454a5102316d740d33a4ba9e52908f89e16b725b5e18b325399e27ff5603b649bfd0d892bad2597273d9ceb80c432fbeeaab0c0465ccf55 -Size (rust-std-1.49.0-i686-unknown-linux-gnu.tar.gz) = 34871922 bytes -SHA1 (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = 82b880a53d18895d413666292705b89910457ec2 -RMD160 (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = e3d64206873fa9b5d8ca5bef8cc5a07739bf03fc -SHA512 (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = 07a47749534cc266092933c334c1876592403bfb7ae929b3035f0eae3d92cf9b3b9bba09980770fdd7f58e92ff083c4ed5e49b886c24245d43ee97f31b2f165a -Size (rust-std-1.49.0-i686-unknown-netbsd.tar.gz) = 30854538 bytes -SHA1 (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = ada449dbe578ff7473d91e882f53c2cff0392be3 -RMD160 (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = 79df3bb4cac9bd821ebd54f3d4ca63ff78b7ec0f -SHA512 (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = 35021e195d7d7c4ab505889b425ba87d53fe839c10c954a21474e6def8f82bdc2d48e4429e3ffb15982780e5382a88756c5efd1ea6cca351be540e625e23d473 -Size (rust-std-1.49.0-powerpc-unknown-netbsd.tar.gz) = 24361787 bytes -SHA1 (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 00f7aeee7efdc6a48529d4a77393858d744cd0b4 -RMD160 (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = c72c212d69256136ddc49cfa94281a4af90618da -SHA512 (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 93cc2de39630ccfe0ec8ec99248116f692b79ec428e4980e14e33bb66515826099c0fa21b78495efd68a48c81d407cdcb008e154baa3697aa4bbd415b6dc722d -Size (rust-std-1.49.0-powerpc-unknown-netbsd90.tar.gz) = 24355869 bytes -SHA1 (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 04b12a7778944d03446df235a3dd28533d056f81 -RMD160 (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 4a7f19c5539b012b6e0b10e2cf2d57ffc7a1243b -SHA512 (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 7828a1205373d938a1417c23f5ade5f82980db247dae40b0e9a6506319f4f3bdc413b25c6ffc6b82c3eb191030b3d3ee54d30c0caec8d7e4f75b7c5cc4cd439f -Size (rust-std-1.49.0-sparc64-unknown-netbsd.tar.gz) = 24558005 bytes -SHA1 (rust-std-1.49.0-x86_64-apple-darwin.tar.gz) = c41c47d76316bb14b3cde8c65b79a94ab10c3685 -RMD160 (rust-std-1.49.0-x86_64-apple-darwin.tar.gz) = b43ecabbcfa19327be5dccf09fc72855d0707a49 -SHA512 (rust-std-1.49.0-x86_64-apple-darwin.tar.gz) = 932de6e305035f9c83a8fe700b0b18bc9f88f556d0e3f0908fd3a6a141e862e016acfa83724517a21b9ba25fd76efbb1d6b5ea41f07e87409e353ab8a8bb11f3 -Size (rust-std-1.49.0-x86_64-apple-darwin.tar.gz) = 35384330 bytes -SHA1 (rust-std-1.49.0-x86_64-unknown-freebsd.tar.gz) = 9a8a5c3b5c329126f60dda2cf4aa3760f23ff5c0 -RMD160 (rust-std-1.49.0-x86_64-unknown-freebsd.tar.gz) = d4a18f9b630d7d629457af633e03d58a253e88ae -SHA512 (rust-std-1.49.0-x86_64-unknown-freebsd.tar.gz) = 59bc9b4073bd3928f72376e2f73266a9d35b22637bcc12a781586c84e3c57299a3662ecbd6f2fd49ce3390b1b84b8676e200ad3bf08f42bc3659ae9e434cd926 -Size (rust-std-1.49.0-x86_64-unknown-freebsd.tar.gz) = 34555877 bytes -SHA1 (rust-std-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 96d184f1b39dcf3cb91e938f53aa79e78eebff53 -RMD160 (rust-std-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = bd1afebd4c117df734ebc5b41ceae7f80428020c -SHA512 (rust-std-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 4c0d51989d44c6b113fdeb67508c28a434779ff2f944c9d04c428536a2e820a1b0d0feef96fea606cbf43276ca546a44614fd7a468d35d8c6c5094d892995f4c -Size (rust-std-1.49.0-x86_64-unknown-linux-gnu.tar.gz) = 38292344 bytes -SHA1 (rust-std-1.49.0-x86_64-unknown-netbsd.tar.gz) = ee366640b89f6af3d5eeac5068a6d344e40f3710 -RMD160 (rust-std-1.49.0-x86_64-unknown-netbsd.tar.gz) = fdb5e5201d217985e2a667d5aba425205e7763b6 -SHA512 (rust-std-1.49.0-x86_64-unknown-netbsd.tar.gz) = 919fa961ec132df601db47f7a0ffd4bf8c3c5e5f562374dad0c9bea53fe2c9132f024284f898cc248d8fd9ee675c1eb0c17742a6b79e4edf87c035cb2cfbb5e3 -Size (rust-std-1.49.0-x86_64-unknown-netbsd.tar.gz) = 34459628 bytes -SHA1 (rustc-1.50.0-src.tar.gz) = 86657ff8f88d6ed8dd48189493249e4b8ec99ca7 -RMD160 (rustc-1.50.0-src.tar.gz) = 07633389398c9e746a6d349e97775201aaeeeb3b -SHA512 (rustc-1.50.0-src.tar.gz) = 30a8a64379427901fe9a23044897456f26e7f7ab146400464feeb663aeff7539c98d78ecbd6a446535a86c8740a6ece9edf19807dc28795b832a988722fe7990 -Size (rustc-1.50.0-src.tar.gz) = 159542148 bytes +SHA1 (rust-1.50.0-aarch64-apple-darwin.tar.gz) = 5c8b553294492eb28d6076a803dd17079a526e15 +RMD160 (rust-1.50.0-aarch64-apple-darwin.tar.gz) = d864fce6a136027868760f965830f53b6c2a0b9a +SHA512 (rust-1.50.0-aarch64-apple-darwin.tar.gz) = f463336127b7e3151c734b86e6711a3691ca2a556c641b745717e90ec69e13b119b856e4512003de19f50a4bcd89d12db0f07d10b64e84ea73ceaeeaabed0eaa +Size (rust-1.50.0-aarch64-apple-darwin.tar.gz) = 257188174 bytes +SHA1 (rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 3f078e2e2f55e43ba98cb2acd21d40e5e9cc49a8 +RMD160 (rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 3847eaaa8072efe27b0e7411795d98aa6fca0003 +SHA512 (rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 14ab31538d3f43200463bd9dc392b4488f2d7fccba5179b449ada4a51bca7de61e5e190f9b9f3627011ba803e609e3ccf2fcf649ea6f0cac602269626cdddc33 +Size (rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 348339759 bytes +SHA1 (rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = bb36673c48642da22f608c091aae54e334c6592c +RMD160 (rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = 63c54020bd0b97ad344b0f07e331cd735fc8a375 +SHA512 (rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = 76153bf8295de8c994289648c2458492ac0c771696f85a9d1d3ab7c6bb08626f9876cad1fd270000742305f3bd334d294ade76a477149a02c9100807e350a4e2 +Size (rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = 282637715 bytes +SHA1 (rust-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = 3c3cbd32918aa3be62db1f7a2e6d7b96768f396d +RMD160 (rust-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = 187837a48f8ac8028565750f1bd1fe07a58df962 +SHA512 (rust-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = 87b5ddd3d306899f683ca136acfdc6cd223662df3bf3450077afd50bee20c8b6abc90bff6d5edfc4f21938ff76e20ed679d73017e98011e0675aeaf7b234508d +Size (rust-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = 298844315 bytes +SHA1 (rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 37ff8f32bd2bae5f39ba93e7a49b534ac0a65370 +RMD160 (rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 1f1c3c287c4c5f65e5b06fa2c002fcabacefcab0 +SHA512 (rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = db0ffcca4766992e48eba3161da6e9025de25a647d960804f532fbf0b50a857c264941424e6342186a4c965a575e79da8705864bb95038a21da9e554fb650791 +Size (rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 289456182 bytes +SHA1 (rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 8c78af0b9300e738cd44c8d85226bdb4b277db3c +RMD160 (rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = b0dc7748ed8315c61ef56e3bdd25ec9ccc8cc12a +SHA512 (rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 14e60642262493cb6492945caa6cd25c179328e7e8e0791fbb887411b28989619d2ea80d8cdf9496de1d2f1bfea280fcd8696357f12ec7cbe496a0c8b76a7c0e +Size (rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 259036239 bytes +SHA1 (rust-1.50.0-i586-unknown-netbsd.tar.gz) = f0c3693dda70151825777669bf23538e3ceb6367 +RMD160 (rust-1.50.0-i586-unknown-netbsd.tar.gz) = 02995dd3f6dc114162c42a9ad072dffdd2e756b5 +SHA512 (rust-1.50.0-i586-unknown-netbsd.tar.gz) = b51e6e17b4b81c3885450554aff816d7e0264fa09ffc97c66def20a72a0980451a5c26c12cdc52ff077be77656ab5d986ff2b8ebed6a24355fd76b5479faeb41 +Size (rust-1.50.0-i586-unknown-netbsd.tar.gz) = 316871159 bytes +SHA1 (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = f946618c821caab5c58dd3eb2a3af42cf486c3dd +RMD160 (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = a299095db6fc1a2160415087638a35b0bc02cd95 +SHA512 (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = 13d3e71bf88fc92ffd7f2c5a59e151dcd0e25e1b9256a107d96ab3110bab698b1294fe7dcbc4f3a847c37666e54a6183c41a8320ddbbcd5ebe907e13e7f5c1bc +Size (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = 360543712 bytes +SHA1 (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 6f58b67c3487186e47e6cf12b9ab13562a0724b3 +RMD160 (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 60f565681f2cbed690c1551c7648609cfcb5148d +SHA512 (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 4e5db0d3a5aff3b67c5ec988e6d632fd81dc5cc305aa14bba595de28f3154d13fdcfea6fc69f4a5264220bf471fab1add8ae089a87a05427d7a3a936749941bb +Size (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 313628339 bytes +SHA1 (rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 0579809b8f384304ea95112b933edecdaacd083d +RMD160 (rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 141743e14c9bc5fdce35c83b29262f59b5f062a0 +SHA512 (rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = d0186e7857c5836f260112c1676799816b39b6e424ea20866a9be97b80525f6c0b6f71daacb505844bb600158ca4c7d4c2f6431e198ef7e551a7f400368a2afe +Size (rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 319094630 bytes +SHA1 (rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = 72b6d9e81ea186a049fa83bdcce973faf1bb91db +RMD160 (rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = c26dafe0cdf12cce0b9314eacb2fe8a513a4ccdd +SHA512 (rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = e990096d3b253522818cdd1fe6624b567e9d679d1e4c55fa1392805128b073d55334bc13c9d48e6a7befabb3673c098332e24b7b6e2a07d82eb4181228ab5d90 +Size (rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = 298912500 bytes +SHA1 (rust-1.50.0-x86_64-apple-darwin.tar.gz) = 2f381659e8988f70dbfd593c0e40f69102d1b057 +RMD160 (rust-1.50.0-x86_64-apple-darwin.tar.gz) = 2933afe5b9fee6662b63d6db5fdc81a6618be250 +SHA512 (rust-1.50.0-x86_64-apple-darwin.tar.gz) = 0d1466b3667d48049decf77ce0887b79e4f322a5e48832cefd6f038f67d8868286db2b1d03a2f75012d0e0e663506ef21566877ab625fc047528af617a9b845a +Size (rust-1.50.0-x86_64-apple-darwin.tar.gz) = 289620946 bytes +SHA1 (rust-1.50.0-x86_64-unknown-freebsd.tar.gz) = 4c4f41627ce0cd858d368eae473d596003f75f70 +RMD160 (rust-1.50.0-x86_64-unknown-freebsd.tar.gz) = 0aad96abfc49cc5efa1ca906efdb28664001a236 +SHA512 (rust-1.50.0-x86_64-unknown-freebsd.tar.gz) = 73fbf1cec1ad394a5dceb54a2aa3c50abea8101d9363ff149bf201c99cd4f2834e184bbb95856e22b4f2dd4698125f42e74ba6251ed7921c199101d5ea08c00a +Size (rust-1.50.0-x86_64-unknown-freebsd.tar.gz) = 271458271 bytes +SHA1 (rust-1.50.0-x86_64-unknown-illumos.tar.gz) = 45424cadb4996fac2dc2be7e762070a96a08e3a7 +RMD160 (rust-1.50.0-x86_64-unknown-illumos.tar.gz) = d246a53f826444b9a176c9feaa6cfd59ebbc9680 +SHA512 (rust-1.50.0-x86_64-unknown-illumos.tar.gz) = 4a2326102c23c75118ecafb2f2efcdada84b2a7895b4c1088124ef1a3d05d40420c24321ec5dc3df06c03cb5d487198cc12f48efc514469a3d48143a5c6e4842 +Size (rust-1.50.0-x86_64-unknown-illumos.tar.gz) = 205922547 bytes +SHA1 (rust-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 61f1032e2fa1e8fe36cb4cad74ee5f5065851fe7 +RMD160 (rust-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = a9372164dcae56c93969f747df3079f279c456e7 +SHA512 (rust-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 542c3b00bc07f5c8be318bb63a2da088d43eec687a73fd31b5370825d4cd1335a77636357b0713ccc072a43c1fdbdb68ee8752255ae771b991d3e8e619c79e04 +Size (rust-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 264280899 bytes +SHA1 (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = 3a3aa685e7b999b0ec13447c6343dd6e993feedc +RMD160 (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = 0e47efe8b6de2cf929739ee73134372def159882 +SHA512 (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = b603ebf2475963fdf65eeea9d8db8b9c9e68638ba492a0ed1131259c46f10bfca8868ba1c78a4ce5bde0094d0f3b0e4414dc5b80b087faf129b5aba3e0ad14c5 +Size (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = 256369818 bytes +SHA1 (rust-std-1.50.0-aarch64-apple-darwin.tar.gz) = 1aa302af2062e805f285f991ec5d857ff9a7e952 +RMD160 (rust-std-1.50.0-aarch64-apple-darwin.tar.gz) = 26bf61d3106d1ef827707aafd9348d3475b20679 +SHA512 (rust-std-1.50.0-aarch64-apple-darwin.tar.gz) = f4c699de83664566e187eec7c1c5e9d39ceaf9e7236522829626e45643510d851748f8770c4ce09a556c8ceb4e4357f135ba53cacf555b154eb3c103434d1a51 +Size (rust-std-1.50.0-aarch64-apple-darwin.tar.gz) = 28059579 bytes +SHA1 (rust-std-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 698e7db9bf74ba213c9398d92b9c3b56b76306a0 +RMD160 (rust-std-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = caf3d9dea02360be8ab7a313f192d4d0e3a491cb +SHA512 (rust-std-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = b19d40fc07d9f9df5a3e55c0860705fc92d8fd7e5caaa466150cd8bd86b20ab12b81bd0aef77d20a6ba0f980bf08c12f342093c73d31d400a52b7de2f44fc69c +Size (rust-std-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 42931420 bytes +SHA1 (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = 3a0706658c2967b82117e417a00fabb49e4e5616 +RMD160 (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = 0ce19d5de264b5f6c2c125ca03576934379e2af6 +SHA512 (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = faaec54fbda06c89088ec54a282f1c9d98dadc3ec8de277bd189efa99fffee5c6f8886f1a39b1d6f0ba6f84af79f563b8d56eab290dd765d40cd81177955ccaf +Size (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = 25604488 bytes +SHA1 (rust-std-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = f5bad471c47f072398c0b936559c54598be2dc89 +RMD160 (rust-std-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = 4fa0a6dba32b29ec181fe61a78d776ecf2de1c7b +SHA512 (rust-std-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = fac28f3d98f6f915c36544fd762ec0f6aa01cd403e82c6c54d4a152e1aa214ba56a0879a6602e7906a6f3b2e8fdf3c6691bc3288f72e9a864d9e42c9b267819b +Size (rust-std-1.50.0-arm-unknown-linux-gnueabihf.tar.gz) = 29266447 bytes +SHA1 (rust-std-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 0f39f2a926c34e09eef002339822aac39ee7fb2a +RMD160 (rust-std-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 3d0bf1040e8d4f364ccaa1627b085a6166cb562a +SHA512 (rust-std-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 3c99a651ca5b20db93f9c7219c121c09a4979933ee46dfe60d5ad6e4921d22bdf77f337902b882633e77d5848e77df5981dc8bc022d858276e4f610284165020 +Size (rust-std-1.50.0-armv7-unknown-linux-gnueabihf.tar.gz) = 29576263 bytes +SHA1 (rust-std-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = e268a5d24e98177476f4e0bb8d50d860bbbbfffb +RMD160 (rust-std-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = ef207513cc147584ab93e68a6a95034945987f25 +SHA512 (rust-std-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 2a7fba99d386a95150bc5adac4b98cdbc2df88ab0644a194b8ba6fa53821378495ea0955540b4b0e85ce91faec56b7c098fc55585a55da94d8e04d38f64285f2 +Size (rust-std-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 25557517 bytes +SHA1 (rust-std-1.50.0-i586-unknown-netbsd.tar.gz) = e9e089dfe900a6b21a4dfde59c5a14f9b2534d5b +RMD160 (rust-std-1.50.0-i586-unknown-netbsd.tar.gz) = 83e44dd46ce655552e6574194fd2ba2f1b2e693b +SHA512 (rust-std-1.50.0-i586-unknown-netbsd.tar.gz) = cc612866209314165470db71237478747209ad0304aa8c7dcf61dfdfddea0060190dded92d2cfa11c65625f8f2936d93df1adb20b232fef6a3cbe2201bac668d +Size (rust-std-1.50.0-i586-unknown-netbsd.tar.gz) = 36226995 bytes +SHA1 (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = 1126f9909bc8bbe447f08b5ad656da9424ea31c6 +RMD160 (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = aaa623f1b26e6bd4cfab6d36cf12f448e9f647f5 +SHA512 (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = 550439fe6402c8114f70803749f6514b8da02bfc85777c73079c5667a1df5d31f1c38086f9043bd4fe947367ec583f30f1aa88df293b493b84d699cd946888e7 +Size (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = 40402401 bytes +SHA1 (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = 1ed81ee8b56dccd64adc243a520434d74edefe01 +RMD160 (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = cbf13169b632686db1dd6f17432a8e313bfd6ec5 +SHA512 (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = 2dc92e7a4f0e27a170208ee48e5985aad1ff3dbd8a48ecc24187f46efcdd9817c0e0260fdc605985c1d4cbc7a8612ae64d1e117a5c68ca86fd1b742955181720 +Size (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = 25024173 bytes +SHA1 (rust-std-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 48eaf45623ec75327db2efbd5c50cb8070e07c7b +RMD160 (rust-std-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 0c9f96a811c2e001e2099fc55da356b2eeb7c595 +SHA512 (rust-std-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 6b37e6527012b1e14bcecd5b31a8864680066a9988467037dcea049d3f018a23470e7871b97394f08a2ef008fe1e9844d9da01bf409f3cf920208358ce095293 +Size (rust-std-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 25019088 bytes +SHA1 (rust-std-1.50.0-sparc64-unknown-netbsd.tar.gz) = 22c8b8e3080f10f19c835771145b94e63ff86860 +RMD160 (rust-std-1.50.0-sparc64-unknown-netbsd.tar.gz) = 761af50d1f518f22bbe98edd65fd279b0b3e1ed3 +SHA512 (rust-std-1.50.0-sparc64-unknown-netbsd.tar.gz) = 9c0c2340950a420e0459c66c34ff9a6e808c890e66abcf12c034245edf65bb81e88e08c075ba6052b441ab0399e0af75a13566ad0bd081f4c1d23b2ce62de8f5 +Size (rust-std-1.50.0-sparc64-unknown-netbsd.tar.gz) = 25286447 bytes +SHA1 (rust-std-1.50.0-x86_64-apple-darwin.tar.gz) = ba34a9afc95e26d8ad981a1f6462b62a0a0a13b2 +RMD160 (rust-std-1.50.0-x86_64-apple-darwin.tar.gz) = 2234575725d792e24fe53e0fbae1c786a31e55d0 +SHA512 (rust-std-1.50.0-x86_64-apple-darwin.tar.gz) = c1db5961dfca7bf5923022918ee604bf8535959995a6d5c1a737ada833f4fc0ba93730f7b0c80e5a97868f256e3117e1b074e99e5d70453bbe10f904ead99204 +Size (rust-std-1.50.0-x86_64-apple-darwin.tar.gz) = 40793121 bytes +SHA1 (rust-std-1.50.0-x86_64-unknown-freebsd.tar.gz) = 85916297a1f1f8fd346b51f4984838e413af3c3f +RMD160 (rust-std-1.50.0-x86_64-unknown-freebsd.tar.gz) = b5130575cdce4231960e550099a13324d5cfbc56 +SHA512 (rust-std-1.50.0-x86_64-unknown-freebsd.tar.gz) = 132f9a507523d0f610896913d5d95de55f36fcf3c8f654fa10c07d7c593c0e6f9b3172059a868231e01df3628c7cb5ec6cb2f3c097f58677b7ea28473b700468 +Size (rust-std-1.50.0-x86_64-unknown-freebsd.tar.gz) = 42284734 bytes +SHA1 (rust-std-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 4e31e544e82dd6a25b850e53bce82cfae7cd1829 +RMD160 (rust-std-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 654fec94236ca8c96b37dd4738c4059d3f9df08f +SHA512 (rust-std-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 0738fccf96754dc0333a9c2d1a2ceca5ddac5664bad650c2ff5967ff532821f277fc8aa97b461029b6cab89ee758f2f1dd7102240247ae1acbcdbe31c71f26cb +Size (rust-std-1.50.0-x86_64-unknown-linux-gnu.tar.gz) = 43778041 bytes +SHA1 (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = f2eb537fe359fca0533a1b90ea68b16406575c3e +RMD160 (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = bbb1ea37aa484119b07f4a53d69a993c498b1eea +SHA512 (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = 19af8459daa06434a9cb71f379cb43d5e2c3805c040f0afef804327f920fa55c6dc5dcce634f12c7e9e334d491df679e98ddec4f7ded5167b0ba5959eefdc6be +Size (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = 39808048 bytes +SHA1 (rustc-1.51.0-src.tar.gz) = 7a54c0a17efed9b41e6f211727edc5e00620b871 +RMD160 (rustc-1.51.0-src.tar.gz) = 86012fa02e52e4a06e5c76aaa482face78b38ef5 +SHA512 (rustc-1.51.0-src.tar.gz) = 694189c7d48537b29fdf39e1b4cac58166c72d8e5adef59da788a5a49ac803ef4c1648b3e36bc9834305240a3a394bef052fc3388ea9b7de46d3e5c7342aefe7 +Size (rustc-1.51.0-src.tar.gz) = 160954811 bytes SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 72746bbf0fa5e72fe151c95e3876b9eb1e70ae39 SHA1 (patch-compiler_rustc__llvm_build.rs) = 88b3b4dbafbd9d8e43998a0f19e3212493ca0add -SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 96611262cd34bbc7f1f757f9df354760cd65fe85 -SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 4b44776982c715f818342b56564efa9576ca995e +SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = d7cf546dc82bb851c94733b0c2dae988393503b3 +SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 8016df2ef0cf1e82b62d18ef156da9806988cb79 +SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = cfd6584417d4d07ec6326aaf597aa211eac2645f SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 877d185e5ca58a3a3f145558be527185a276c154 SHA1 (patch-compiler_rustc__target_src_spec_solaris__base.rs) = f0b41a3a5685ae33d037f8ded0b1fa6f1acb0867 -SHA1 (patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs) = f629fcf782c0c915c2921456eb1ffa8e91c244c1 SHA1 (patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure) = 5dc1cfc843894156b513c86453db5032917a5529 SHA1 (patch-library_std_src_sys_unix_mod.rs) = 927b03f3f34bd21a81bd2a8b6bcf30fe241e2d32 -SHA1 (patch-library_std_src_sys_unix_thread.rs) = c431e3221849e3220fc63b072984ccb1896f83c8 -SHA1 (patch-library_unwind_build.rs) = 2cff0229bfb26445ea3f2e2e5b6e4ea8884df28f -SHA1 (patch-src_bootstrap_bootstrap.py) = a8c094a781339a613221259d8ce7d00f6e0aa3e6 -SHA1 (patch-src_bootstrap_builder.rs) = d6ea923f5c67a1b1e98350d6269b4d78817a5934 -SHA1 (patch-src_bootstrap_compile.rs) = 5d5d31eb08d404cb24aca7e1be8de438004a49d6 -SHA1 (patch-src_bootstrap_lib.rs) = 4b2ff5b2e280e3523ef1fd8903fab7324e6699a0 -SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 03a95b0893a339cb34b0b84773e33ade50deb87e +SHA1 (patch-library_std_src_sys_unix_thread.rs) = f3af869fba5bc0ab8d28042f55fe830f93b8ef54 +SHA1 (patch-library_unwind_build.rs) = ae096a20aed95304eb3806be4cd237fe4ffd9afb +SHA1 (patch-src_bootstrap_bootstrap.py) = ca87e6c58f34835b420a63a18ca95605a18657c6 +SHA1 (patch-src_bootstrap_builder.rs) = e04b3212786a422f70516227f7cbc7b29dcd699d +SHA1 (patch-src_bootstrap_compile.rs) = 86fe55d04f7a8c5ec05dbdcb0fe5a0d6c07584d5 +SHA1 (patch-src_bootstrap_lib.rs) = 3277f2be69a269ac761a2a6ab4d5389d121e6ca6 +SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 4d35c1d51e0bb6f5cf4c48ed3f68826624f6934e SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a -SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 213870dbeac00aa465ba65a12cfb47d2c58edcfd -SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 272c5049b62e371ff3b975b70302a111dc4871c1 -SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 1109d9adafae49434f2979af061c052e68a855a7 -SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 7d9910f62ed7e8b8ba2120b71b96a7b3324b8a5f -SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = 5b79c164e0a10d282a12578d41d0ae4ed2283236 -SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 23b827fe5ce421e4b63e8ae22d0c9cc282a4b8ac -SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2 -SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = ff77adccf71e3683d8465d8b08face45e7b2b8a9 -SHA1 (patch-vendor_lzma-sys_config.h) = 414c5c46eae69f205e958b0fd01af7feca2bfd63 +SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6 +SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939 +SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80 +SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c +SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7 +SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34 +SHA1 (patch-src_tools_rust-installer_install-template.sh) = 9f93da54d9a126390d1ec9d1430241f876c8ba3f +SHA1 (patch-vendor_cc-1.0.60_src_lib.rs) = 42ddba7dfbec922e5ef948b97ff8c70bae1b0113 +SHA1 (patch-vendor_cc_src_lib.rs) = 27d8b8b6d9a607362152069a206298854f517460 +SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b +SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437 SHA1 (patch-vendor_net2_src_ext.rs) = 5c34f3eaaa0589eefe14d374d34fadd4900565fd -SHA1 (patch-vendor_openssl-src_src_lib.rs) = cd4e6269fad10c6c7f51a044a16303ab1c55a8bf -SHA1 (patch-vendor_stacker_src_lib.rs) = 5da51ee9cc928617f0a2b35eedabb7071fbfb059 +SHA1 (patch-vendor_openssl-src_src_lib.rs) = 67e5352830dd1de9cfb809df55d2dc702f371171 +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) = e3feaf809eb568c3fb34b5880cfa45ec4d71238b +SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3 +SHA1 (patch-vendor_target-lexicon_src_targets.rs) = ec46802e2ec4bcce80a859b435b591ff464e9a42 diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs new file mode 100644 index 000000000000..aedfc09c3fec --- /dev/null +++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs @@ -0,0 +1,27 @@ +$NetBSD: patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.1 2021/05/26 09:21:39 he Exp $ + +Add aarch64_be NetBSD target. + +--- compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs.orig 2021-04-25 17:12:53.986628780 +0200 ++++ compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs 2021-04-25 18:00:57.795577197 +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-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs index 2447fe4dcd4d..55f190868227 100644 --- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs +++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs @@ -1,18 +1,19 @@ -$NetBSD: patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs,v 1.1 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs,v 1.2 2021/05/26 09:21:39 he Exp $ Add an i586 / pentium variant, in an effort to support AMD Geode etc. --- compiler/rustc_target/src/speci586_unknown_netbsd.rs.orig 2021-04-11 00:12:43.084770395 +0200 -+++ compiler/rustc_target/src/spec/i586_unknown_netbsd.rs 2021-04-17 00:25:10.240902011 +0200 -@@ -0,0 +1,19 @@ -+use crate::spec::{LinkerFlavor, Target, TargetOptions}; ++++ compiler/rustc_target/src/spec/i586_unknown_netbsd.rs 2021-04-11 00:15:29.313073646 +0200 +@@ -0,0 +1,20 @@ ++use crate::spec::{LinkerFlavor, StackProbeType, Target, TargetOptions}; + +pub fn target() -> Target { + let mut base = super::netbsd_base::opts(); + base.cpu = "pentium".to_string(); + base.max_atomic_width = Some(64); + base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); -+ base.stack_probes = true; ++ // don't use probe-stack=inline-asm until rust-lang/rust#83139 is resolved. ++ base.stack_probes = StackProbeType::Call; + + Target { + llvm_target: "i586-unknown-netbsdelf".to_string(), 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 886ef0132346..3147921e7cce 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,11 +1,14 @@ -$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.1 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.2 2021/05/26 09:21:39 he Exp $ -Add reference to i586 / pentium NetBSD variant. +Add i586(pentium) and aarch64_be targets. ---- compiler/rustc_target/src/spec/mod.rs.orig 2021-02-10 17:36:44.000000000 +0000 +--- compiler/rustc_target/src/spec/mod.rs.orig 2021-03-23 16:15:10.000000000 +0000 +++ compiler/rustc_target/src/spec/mod.rs -@@ -551,6 +551,7 @@ supported_targets! { +@@ -695,8 +695,10 @@ supported_targets! { + ("x86_64-unknown-openbsd", x86_64_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), + ("i586-unknown-netbsd", i586_unknown_netbsd), diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs deleted file mode 100644 index 0329c8efe9e0..000000000000 --- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs,v 1.2 2021/02/14 08:24:31 he Exp $ - -Disable stack probes on SunOS. - ---- compiler/rustc_target/src/spec/x86_64_sun_solaris.rs.orig 2020-12-29 03:03:08.000000000 +0000 -+++ compiler/rustc_target/src/spec/x86_64_sun_solaris.rs -@@ -5,7 +5,6 @@ pub fn target() -> Target { - base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]); - base.cpu = "x86-64".to_string(); - base.max_atomic_width = Some(64); -- base.stack_probes = true; - - Target { - llvm_target: "x86_64-pc-solaris".to_string(), 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 746d5363d217..6f6c9cd62623 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.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.3 2021/05/26 09:21:39 he Exp $ Fix stack-clash on SunOS. ---- library/std/src/sys/unix/thread.rs.orig 2021-02-10 17:36:44.000000000 +0000 +--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000 +++ library/std/src/sys/unix/thread.rs -@@ -322,7 +322,7 @@ pub mod guard { +@@ -333,7 +333,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 d400b50d197f..f9a8c0775bf7 100644 --- a/lang/rust/patches/patch-library_unwind_build.rs +++ b/lang/rust/patches/patch-library_unwind_build.rs @@ -1,15 +1,15 @@ -$NetBSD: patch-library_unwind_build.rs,v 1.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-library_unwind_build.rs,v 1.3 2021/05/26 09:21:39 he Exp $ Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this. ---- library/unwind/build.rs.orig 2021-02-10 17:36:44.000000000 +0000 +--- library/unwind/build.rs.orig 2020-10-07 07:53:22.000000000 +0000 +++ library/unwind/build.rs -@@ -21,7 +21,9 @@ fn main() { +@@ -23,7 +23,9 @@ fn main() { } else if target.contains("rumprun") { println!("cargo:rustc-link-lib=unwind"); } else if target.contains("netbsd") { - println!("cargo:rustc-link-lib=gcc_s"); -+ if !env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { ++ if !env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { + println!("cargo:rustc-link-lib=gcc_s"); + } } else if target.contains("openbsd") { diff --git a/lang/rust/patches/patch-src_bootstrap_bootstrap.py b/lang/rust/patches/patch-src_bootstrap_bootstrap.py index 27a1c97f2350..1a84ed9c5cb0 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.5 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.6 2021/05/26 09:21:39 he Exp $ Use `uname -p` on NetBSD, as that is reliable and sensible there. Do not use debuginfo; optimize 'bootstrap' instead. @@ -6,7 +6,7 @@ --- src/bootstrap/bootstrap.py.orig 2021-02-10 17:36:44.000000000 +0000 +++ src/bootstrap/bootstrap.py -@@ -228,6 +228,11 @@ def default_build_triple(verbose): +@@ -229,6 +229,11 @@ def default_build_triple(verbose): 'OpenBSD': 'unknown-openbsd' } @@ -18,7 +18,15 @@ # Consider the direct transformation first and then the special cases if ostype in ostype_mapper: ostype = ostype_mapper[ostype] -@@ -314,10 +319,12 @@ def default_build_triple(verbose): +@@ -279,6 +284,7 @@ def default_build_triple(verbose): + cputype_mapper = { + 'BePC': 'i686', + 'aarch64': 'aarch64', ++ 'aarch64eb': 'aarch64', + 'amd64': 'x86_64', + 'arm64': 'aarch64', + 'i386': 'i686', +@@ -315,10 +321,12 @@ def default_build_triple(verbose): ostype = 'linux-androideabi' else: ostype += 'eabihf' @@ -32,7 +40,7 @@ else: ostype += 'eabihf' elif cputype == 'mips': -@@ -793,7 +800,7 @@ class RustBuild(object): +@@ -821,7 +829,7 @@ class RustBuild(object): if "LIBRARY_PATH" in env else "" # preserve existing RUSTFLAGS env.setdefault("RUSTFLAGS", "") diff --git a/lang/rust/patches/patch-src_bootstrap_builder.rs b/lang/rust/patches/patch-src_bootstrap_builder.rs index 7f1e64e17b25..292412164c19 100644 --- a/lang/rust/patches/patch-src_bootstrap_builder.rs +++ b/lang/rust/patches/patch-src_bootstrap_builder.rs @@ -1,13 +1,15 @@ -$NetBSD: patch-src_bootstrap_builder.rs,v 1.14 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_bootstrap_builder.rs,v 1.15 2021/05/26 09:21:39 he Exp $ Do not install 'src'. Use @PREFIX@, not $ORIGIN in rpath. Fix RPATH for pkgsrc. ---- src/bootstrap/builder.rs.orig 2021-02-10 17:36:44.000000000 +0000 +Workaround for building 1.51 with 1.51 bootstrap. + +--- src/bootstrap/builder.rs.orig 2021-03-23 16:15:10.000000000 +0000 +++ src/bootstrap/builder.rs -@@ -483,7 +483,6 @@ impl<'a> Builder<'a> { +@@ -482,7 +482,6 @@ impl<'a> Builder<'a> { install::Clippy, install::Miri, install::Analysis, @@ -15,7 +17,7 @@ Fix RPATH for pkgsrc. install::Rustc ), Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest), -@@ -1082,7 +1081,7 @@ impl<'a> Builder<'a> { +@@ -1088,7 +1087,7 @@ impl<'a> Builder<'a> { rustflags.arg("-Zosx-rpath-install-name"); Some("-Wl,-rpath,@loader_path/../lib") } else if !target.contains("windows") { @@ -24,3 +26,12 @@ Fix RPATH for pkgsrc. } else { None }; +@@ -1490,7 +1489,7 @@ impl<'a> Builder<'a> { + for el in stack.iter().rev() { + out += &format!("\t{:?}\n", el); + } +- panic!(out); ++ panic!("{}", out); + } + if let Some(out) = self.cache.get(&step) { + self.verbose(&format!("{}c {:?}", " ".repeat(stack.len()), step)); diff --git a/lang/rust/patches/patch-src_bootstrap_compile.rs b/lang/rust/patches/patch-src_bootstrap_compile.rs index 46a97d5cce16..f4b376bdf85d 100644 --- a/lang/rust/patches/patch-src_bootstrap_compile.rs +++ b/lang/rust/patches/patch-src_bootstrap_compile.rs @@ -1,15 +1,15 @@ -$NetBSD: patch-src_bootstrap_compile.rs,v 1.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_bootstrap_compile.rs,v 1.3 2021/05/26 09:21:39 he Exp $ On Darwin, do not use @rpath for internal libraries. ---- src/bootstrap/compile.rs.orig 2021-02-10 17:36:44.000000000 +0000 +--- src/bootstrap/compile.rs.orig 2021-03-23 16:15:10.000000000 +0000 +++ src/bootstrap/compile.rs -@@ -359,7 +359,7 @@ fn copy_sanitizers( - // Update the library install name reflect the fact it has been renamed. - let status = Command::new("install_name_tool") - .arg("-id") -- .arg(format!("@rpath/{}", runtime.name)) -+ .arg(format!("@PREFIX@/lib/{}", runtime.name)) - .arg(&dst) - .status() - .expect("failed to execute `install_name_tool`"); +@@ -360,7 +360,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. +- apple_darwin_update_library_name(&dst, &format!("@rpath/{}", &runtime.name)); ++ apple_darwin_update_library_name(&dst, &format!("@PREFIX@/lib/{}", &runtime.name)); + // Upon renaming the install name, the code signature of the file will invalidate, + // so we will sign it again. + apple_darwin_sign_file(&dst); diff --git a/lang/rust/patches/patch-src_bootstrap_lib.rs b/lang/rust/patches/patch-src_bootstrap_lib.rs index c49744aff37a..5edec5d6a43c 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.8 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_bootstrap_lib.rs,v 1.9 2021/05/26 09:21:39 he Exp $ Don't filter out optimization flags. FreeBSD has a particular C++ runtime library name ---- src/bootstrap/lib.rs.orig 2021-02-10 17:36:44.000000000 +0000 +--- src/bootstrap/lib.rs.orig 2020-03-09 22:11:17.000000000 +0000 +++ src/bootstrap/lib.rs -@@ -836,7 +836,6 @@ impl Build { +@@ -759,7 +759,6 @@ impl Build { .args() .iter() .map(|s| s.to_string_lossy().into_owned()) @@ -13,7 +13,7 @@ FreeBSD has a particular C++ runtime library name .collect::>(); // If we're compiling on macOS then we add a few unconditional flags -@@ -847,6 +846,11 @@ impl Build { +@@ -770,6 +769,11 @@ impl Build { base.push("-stdlib=libc++".into()); } 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 fae823b7d302..a912e8405415 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.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.3 2021/05/26 09:21:39 he Exp $ Don't implement sys/regset.h workaround, fix source instead. ---- src/llvm-project/llvm/CMakeLists.txt.orig 2020-12-08 20:04:43.000000000 +0000 +--- src/llvm-project/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000 +++ src/llvm-project/llvm/CMakeLists.txt -@@ -959,11 +959,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBS +@@ -806,11 +806,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBS link_directories("/usr/local/lib") endif(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h index f1920ea8228b..7e48535229f5 100644 --- a/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h +++ b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h @@ -1,10 +1,10 @@ -$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.3 2021/05/26 09:21:39 he Exp $ Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h ---- src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h.orig 2020-12-08 20:04:43.000000000 +0000 +--- src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h.orig 2018-08-01 16:32:37.000000000 +0000 +++ src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h -@@ -19,6 +19,10 @@ +@@ -20,6 +20,10 @@ #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H #define LLVM_ANALYSIS_CONSTANTFOLDING_H 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 38de7478f1bd..0fd3e078b312 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.3 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.4 2021/05/26 09:21:39 he Exp $ Avoid ambiguous function call. ---- src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp.orig 2020-12-08 20:04:43.000000000 +0000 +--- 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 -@@ -558,7 +558,7 @@ static void DumpAnnotatedInput(raw_ostre +@@ -406,7 +406,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 9736bf683855..61783654a425 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.4 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.5 2021/05/26 09:21:39 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 2021-02-10 17:37:00.000000000 +0000 +--- 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 -@@ -695,6 +695,9 @@ impl Profile { +@@ -458,6 +458,9 @@ impl Profile { debuginfo: Some(2), debug_assertions: true, overflow_checks: true, diff --git a/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs index 5f61a77ca1fb..4374eaf517a7 100644 --- a/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs +++ b/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs @@ -1,11 +1,11 @@ -$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.6 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.7 2021/05/26 09:21:39 he Exp $ Don't attempt incremental operations on sparc64, ref. https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/ ---- src/tools/cargo/tests/testsuite/build.rs.orig 2021-02-10 17:37:00.000000000 +0000 +--- src/tools/cargo/tests/testsuite/build.rs.orig 2019-08-13 06:27:40.000000000 +0000 +++ src/tools/cargo/tests/testsuite/build.rs -@@ -45,6 +45,7 @@ fn cargo_fail_with_no_stderr() { +@@ -38,6 +38,7 @@ fn cargo_fail_with_no_stderr() { /// Checks that the `CARGO_INCREMENTAL` environment variable results in /// `rustc` getting `-C incremental` passed to it. @@ -13,7 +13,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment #[cargo_test] fn cargo_compile_incremental() { let p = project() -@@ -67,6 +68,7 @@ fn cargo_compile_incremental() { +@@ -60,6 +61,7 @@ fn cargo_compile_incremental() { .run(); } @@ -21,7 +21,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment #[cargo_test] fn incremental_profile() { let p = project() -@@ -109,6 +111,7 @@ fn incremental_profile() { +@@ -102,6 +104,7 @@ fn incremental_profile() { .run(); } diff --git a/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs b/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs index 6d306aaf9c69..de4714b51dcd 100644 --- a/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs +++ b/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs @@ -1,11 +1,11 @@ -$NetBSD: patch-src_tools_rls_rls_src_cmd.rs,v 1.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_tools_rls_rls_src_cmd.rs,v 1.3 2021/05/26 09:21:39 he Exp $ Use 32-bit atomic instead of 64-bit; latter may not be available on 32-bit platforms (powerpc, earmv7). ---- src/tools/rls/rls/src/cmd.rs.orig 2021-02-10 17:37:00.000000000 +0000 +--- src/tools/rls/rls/src/cmd.rs.orig 2019-04-10 18:46:16.000000000 +0000 +++ src/tools/rls/rls/src/cmd.rs -@@ -7,7 +7,7 @@ use crate::config::Config; +@@ -17,7 +17,7 @@ use crate::config::Config; use crate::server::{self, LsService, Notification, Request, RequestId}; use rls_analysis::{AnalysisHost, Target}; use rls_vfs::Vfs; @@ -14,7 +14,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on use lsp_types::{ ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, -@@ -316,8 +316,8 @@ fn url(file_name: &str) -> Url { +@@ -323,8 +323,8 @@ fn url(file_name: &str) -> Url { } fn next_id() -> RequestId { diff --git a/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs b/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs index ffb45495c1c9..ef320addd19b 100644 --- a/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs +++ b/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs @@ -1,11 +1,11 @@ -$NetBSD: patch-src_tools_rls_rls_src_server_io.rs,v 1.3 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-src_tools_rls_rls_src_server_io.rs,v 1.4 2021/05/26 09:21:39 he Exp $ Use 32-bit atomic instead of 64-bit; latter may not be available on 32-bit platforms (powerpc, earmv7). ---- src/tools/rls/rls/src/server/io.rs.orig 2021-02-10 17:37:00.000000000 +0000 +--- src/tools/rls/rls/src/server/io.rs.orig 2019-05-20 12:10:32.000000000 +0000 +++ src/tools/rls/rls/src/server/io.rs -@@ -5,7 +5,7 @@ use crate::lsp_data::{LSPNotification, L +@@ -7,7 +7,7 @@ use crate::lsp_data::{LSPNotification, L use std::fmt; use std::io::{self, BufRead, Write}; @@ -14,7 +14,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on use std::sync::Arc; use jsonrpc_core::{self as jsonrpc, response, version, Id}; -@@ -169,13 +169,13 @@ pub trait Output: Sync + Send + Clone + +@@ -171,13 +171,13 @@ pub trait Output: Sync + Send + Clone + /// An output that sends notifications and responses on `stdout`. #[derive(Clone)] pub(super) struct StdioOutput { @@ -30,7 +30,7 @@ Use 32-bit atomic instead of 64-bit; latter may not be available on } } -@@ -192,7 +192,7 @@ impl Output for StdioOutput { +@@ -194,7 +194,7 @@ impl Output for StdioOutput { } fn provide_id(&self) -> RequestId { diff --git a/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh b/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh index adae00e9128e..efde185b51c7 100644 --- a/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh +++ b/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh @@ -1,9 +1,14 @@ -$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.3 2018/11/27 15:45:23 adam Exp $ +$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.4 2021/05/26 09:21:39 he Exp $ No logging to 'install.log'. Do not create 'uninstall.sh'. ---- src/tools/rust-installer/install-template.sh.orig 2018-11-07 03:23:50.000000000 +0000 +Rewrite to not use a whole lot of subprocesses just for doing +pattern matching and substitution in the install phase using "grep" +and "sed" when shell builtin "case" and "omit shortest match" ops +should do just fine. + +--- src/tools/rust-installer/install-template.sh.orig 2021-03-23 16:15:29.000000000 +0000 +++ src/tools/rust-installer/install-template.sh @@ -15,20 +15,12 @@ set -u init_logging() { @@ -26,7 +31,146 @@ Do not create 'uninstall.sh'. } msg() { -@@ -972,7 +964,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_ +@@ -442,8 +434,8 @@ uninstall_components() { + local _directive + while read _directive; do + +- local _command=`echo $_directive | cut -f1 -d:` +- local _file=`echo $_directive | cut -f2 -d:` ++ local _command=${_directive%%:*} ++ local _file=${_directive#*:} + + # Sanity checks + if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi +@@ -549,8 +541,8 @@ install_components() { + local _directive + while read _directive; do + +- local _command=`echo $_directive | cut -f1 -d:` +- local _file=`echo $_directive | cut -f2 -d:` ++ local _command=${_directive%%:*} ++ local _file=${_directive#*:} + + # Sanity checks + if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi +@@ -559,54 +551,45 @@ install_components() { + # Decide the destination of the file + local _file_install_path="$_dest_prefix/$_file" + +- if echo "$_file" | grep "^etc/" > /dev/null +- then +- local _f="$(echo "$_file" | sed 's/^etc\///')" +- _file_install_path="$CFG_SYSCONFDIR/$_f" +- fi +- +- if echo "$_file" | grep "^bin/" > /dev/null +- then +- local _f="$(echo "$_file" | sed 's/^bin\///')" +- _file_install_path="$CFG_BINDIR/$_f" +- fi +- +- if echo "$_file" | grep "^lib/" > /dev/null +- then +- local _f="$(echo "$_file" | sed 's/^lib\///')" +- _file_install_path="$CFG_LIBDIR/$_f" +- fi +- +- if echo "$_file" | grep "^share" > /dev/null +- then +- local _f="$(echo "$_file" | sed 's/^share\///')" +- _file_install_path="$CFG_DATADIR/$_f" +- fi +- +- if echo "$_file" | grep "^share/man/" > /dev/null +- then +- local _f="$(echo "$_file" | sed 's/^share\/man\///')" +- _file_install_path="$CFG_MANDIR/$_f" +- fi ++ case "$_file" in ++ etc/*) ++ local _f=${_file#"etc/"} ++ _file_install_path="$CFG_SYSCONFDIR/$_f" ++ ;; ++ bin/*) ++ local _f=${_file#"bin/"} ++ _file_install_path="$CFG_BINDIR/$_f" ++ ;; ++ lib/*) ++ local _f=${_file#"lib/"} ++ _file_install_path="$CFG_LIBDIR/$_f" ++ ;; ++ share/man/*) ++ local _f=${_file#"share/man/"} ++ _file_install_path="$CFG_MANDIR/$_f" ++ ;; ++ share/doc/*) ++ # HACK: Try to support overriding --docdir. Paths with the form ++ # "share/doc/$product/" can be redirected to a single --docdir ++ # path. If the following detects that --docdir has been specified ++ # then it will replace everything preceeding the "$product" path ++ # component. The problem here is that the combined rust installer ++ # contains two "products": rust and cargo; so the contents of those ++ # directories will both be dumped into the same directory; and the ++ # contents of those directories are _not_ disjoint. Since this feature ++ # is almost entirely to support 'make install' anyway I don't expect ++ # this problem to be a big deal in practice. ++ if [ "$CFG_DOCDIR" != "" ]; then ++ local _f=${_file#"share/doc/"} ++ _file_install_path="$CFG_DOCDIR/$_f" ++ fi ++ ;; ++ share/*) ++ local _f=${_file#"share/"} ++ _file_install_path="$CFG_DATADIR/$_f" ++ ;; ++ esac + +- # HACK: Try to support overriding --docdir. Paths with the form +- # "share/doc/$product/" can be redirected to a single --docdir +- # path. If the following detects that --docdir has been specified +- # then it will replace everything preceeding the "$product" path +- # component. The problem here is that the combined rust installer +- # contains two "products": rust and cargo; so the contents of those +- # directories will both be dumped into the same directory; and the +- # contents of those directories are _not_ disjoint. Since this feature +- # is almost entirely to support 'make install' anyway I don't expect +- # this problem to be a big deal in practice. +- if [ "$CFG_DOCDIR" != "" ] +- then +- if echo "$_file" | grep "^share/doc/" > /dev/null +- then +- local _f="$(echo "$_file" | sed 's/^share\/doc\/[^/]*\///')" +- _file_install_path="$CFG_DOCDIR/$_f" +- fi +- fi + + # Make sure there's a directory for it + make_dir_recursive "$(dirname "$_file_install_path")" +@@ -625,14 +608,16 @@ install_components() { + + maybe_backup_path "$_file_install_path" + +- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" +- then +- run cp "$_src_dir/$_component/$_file" "$_file_install_path" +- run chmod 755 "$_file_install_path" +- else +- run cp "$_src_dir/$_component/$_file" "$_file_install_path" +- run chmod 644 "$_file_install_path" ++ local mode=644 ++ if test -x "$_src_dir/$_component/$_file"; then ++ mode=755 + fi ++ case "$_file" in ++ bin/*) mode=755 ++ ;; ++ esac ++ run cp "$_src_dir/$_component/$_file" "$_file_install_path" ++ run chmod $mode "$_file_install_path" + critical_need_ok "file creation failed" + + # Update the manifest +@@ -972,7 +957,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_ critical_need_ok "failed to write installer version" # Install the uninstaller diff --git a/lang/rust/patches/patch-vendor_cc-1.0.60_src_lib.rs b/lang/rust/patches/patch-vendor_cc-1.0.60_src_lib.rs new file mode 100644 index 000000000000..0ce6b0fc88e5 --- /dev/null +++ b/lang/rust/patches/patch-vendor_cc-1.0.60_src_lib.rs @@ -0,0 +1,15 @@ +$NetBSD: patch-vendor_cc-1.0.60_src_lib.rs,v 1.1 2021/05/26 09:21:39 he Exp $ + +Add aarch64_be NetBSD target. +Needed? (Linux apparently doesn't.) + +--- vendor/cc-1.0.60/src/lib.rs.orig 2021-03-23 16:54:51.000000000 +0000 ++++ vendor/cc-1.0.60/src/lib.rs +@@ -2267,6 +2267,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"), ++ "aarch64_be-unknown-netbsd" => Some("aarch64_be--netbsd"), + "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), + "armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), + "armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), diff --git a/lang/rust/patches/patch-vendor_cc_src_lib.rs b/lang/rust/patches/patch-vendor_cc_src_lib.rs new file mode 100644 index 000000000000..ec83bc095af4 --- /dev/null +++ b/lang/rust/patches/patch-vendor_cc_src_lib.rs @@ -0,0 +1,14 @@ +$NetBSD: patch-vendor_cc_src_lib.rs,v 1.1 2021/05/26 09:21:39 he Exp $ + +Add aarch64_eb. + +--- vendor/cc/src/lib.rs.orig 2021-03-23 16:54:51.000000000 +0000 ++++ vendor/cc/src/lib.rs +@@ -2353,6 +2353,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"), ++ "aarch64_eb-unknown-netbsd" => Some("aarch64_be--netbsd"), + "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), + "armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), + "armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), 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 291be0189130..7a712ad137f4 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.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.3 2021/05/26 09:21:39 he Exp $ Fix xattr build. ---- vendor/libc/src/unix/solarish/mod.rs.orig 2021-02-10 18:18:38.000000000 +0000 +--- vendor/libc/src/unix/solarish/mod.rs.orig 2019-05-20 13:47:24.000000000 +0000 +++ vendor/libc/src/unix/solarish/mod.rs -@@ -1177,6 +1177,8 @@ pub const EOWNERDEAD: ::c_int = 58; +@@ -981,6 +981,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_lzma-sys_config.h b/lang/rust/patches/patch-vendor_lzma-sys_config.h index 9b09624fe3be..7654dcc59d22 100644 --- a/lang/rust/patches/patch-vendor_lzma-sys_config.h +++ b/lang/rust/patches/patch-vendor_lzma-sys_config.h @@ -1,8 +1,8 @@ -$NetBSD: patch-vendor_lzma-sys_config.h,v 1.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-vendor_lzma-sys_config.h,v 1.3 2021/05/26 09:21:39 he Exp $ Fix SunOS builds with newer compilers. ---- vendor/lzma-sys/config.h.orig 2019-09-23 23:15:03.000000000 +0000 +--- vendor/lzma-sys/config.h.orig 2020-10-07 09:33:31.000000000 +0000 +++ vendor/lzma-sys/config.h @@ -35,7 +35,11 @@ // change to `MYTHREAD_WIN95` if targeting Windows XP or earlier @@ -15,4 +15,4 @@ Fix SunOS builds with newer compilers. +#endif #define MYTHREAD_POSIX 1 #endif - + diff --git a/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs b/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs index c049d670d648..10fcb142f7fd 100644 --- a/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs +++ b/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs @@ -1,18 +1,19 @@ -$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.3 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.4 2021/05/26 09:21:39 he Exp $ Provide defaults for the various NetBSD targets. ---- vendor/openssl-src/src/lib.rs.orig 2020-12-29 03:36:31.000000000 +0000 +--- vendor/openssl-src/src/lib.rs.orig 2021-03-23 16:54:53.000000000 +0000 +++ vendor/openssl-src/src/lib.rs -@@ -167,6 +167,7 @@ impl Build { +@@ -167,6 +167,8 @@ impl Build { "aarch64-unknown-freebsd" => "BSD-generic64", "aarch64-unknown-linux-gnu" => "linux-aarch64", "aarch64-unknown-linux-musl" => "linux-aarch64", + "aarch64-unknown-netbsd" => "BSD-generic64", ++ "aarch64_be-unknown-netbsd" => "BSD-generic64", "aarch64-pc-windows-msvc" => "VC-WIN64-ARM", "arm-linux-androideabi" => "linux-armv4", "armv7-linux-androideabi" => "linux-armv4", -@@ -178,9 +179,11 @@ impl Build { +@@ -178,6 +180,7 @@ impl Build { "armv7-unknown-freebsd" => "BSD-generic32", "armv7-unknown-linux-gnueabihf" => "linux-armv4", "armv7-unknown-linux-musleabihf" => "linux-armv4", @@ -20,19 +21,16 @@ Provide defaults for the various NetBSD targets. "asmjs-unknown-emscripten" => "gcc", "i586-unknown-linux-gnu" => "linux-elf", "i586-unknown-linux-musl" => "linux-elf", -+ "i586-unknown-netbsd" => "BSD-x86-elf", - "i686-apple-darwin" => "darwin-i386-cc", - "i686-linux-android" => "linux-elf", - "i686-pc-windows-gnu" => "mingw", -@@ -188,6 +191,7 @@ impl Build { +@@ -188,6 +191,8 @@ impl Build { "i686-unknown-freebsd" => "BSD-x86-elf", "i686-unknown-linux-gnu" => "linux-elf", "i686-unknown-linux-musl" => "linux-elf", + "i686-unknown-netbsd" => "BSD-x86-elf", ++ "i586-unknown-netbsd" => "BSD-x86-elf", "mips-unknown-linux-gnu" => "linux-mips32", "mips-unknown-linux-musl" => "linux-mips32", "mips64-unknown-linux-gnuabi64" => "linux64-mips64", -@@ -195,12 +199,14 @@ impl Build { +@@ -195,12 +200,14 @@ impl Build { "mipsel-unknown-linux-gnu" => "linux-mips32", "mipsel-unknown-linux-musl" => "linux-mips32", "powerpc-unknown-linux-gnu" => "linux-ppc", 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 new file mode 100644 index 000000000000..0f260737b508 --- /dev/null +++ b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs @@ -0,0 +1,27 @@ +$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.1 2021/05/26 09:21:39 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 new file mode 100644 index 000000000000..34f233048c6e --- /dev/null +++ b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs @@ -0,0 +1,14 @@ +$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs,v 1.1 2021/05/26 09:21:39 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 +@@ -695,6 +695,7 @@ supported_targets! { + ("x86_64-unknown-openbsd", x86_64_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_stacker_src_lib.rs b/lang/rust/patches/patch-vendor_stacker_src_lib.rs index 098f63623f5f..a027705b7ee9 100644 --- a/lang/rust/patches/patch-vendor_stacker_src_lib.rs +++ b/lang/rust/patches/patch-vendor_stacker_src_lib.rs @@ -1,10 +1,10 @@ -$NetBSD: patch-vendor_stacker_src_lib.rs,v 1.2 2021/04/19 17:08:09 he Exp $ +$NetBSD: patch-vendor_stacker_src_lib.rs,v 1.3 2021/05/26 09:21:39 he Exp $ Avoid missing pthread_* on older SunOS. ---- vendor/stacker/src/lib.rs.orig 2021-02-10 18:18:39.000000000 +0000 +--- vendor/stacker/src/lib.rs.orig 2020-07-13 18:18:17.000000000 +0000 +++ vendor/stacker/src/lib.rs -@@ -407,7 +407,7 @@ cfg_if! { +@@ -355,7 +355,7 @@ cfg_if! { ); Some(mi.assume_init().AllocationBase as usize + get_thread_stack_guarantee() + 0x1000) } diff --git a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs new file mode 100644 index 000000000000..dfaafee669c5 --- /dev/null +++ b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs @@ -0,0 +1,14 @@ +$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.1 2021/05/26 09:21:39 he Exp $ + +Add aarch64_eb for NetBSD. + +--- vendor/target-lexicon/src/targets.rs.orig 2021-03-23 16:54:53.000000000 +0000 ++++ vendor/target-lexicon/src/targets.rs +@@ -1267,6 +1267,7 @@ mod tests { + "aarch64-unknown-linux-gnu", + "aarch64-unknown-linux-musl", + "aarch64-unknown-netbsd", ++ "aarch64_be-unknown-netbsd", + "aarch64-unknown-none", + "aarch64-unknown-none-softfloat", + "aarch64-unknown-openbsd", diff --git a/lang/rust/platform.mk b/lang/rust/platform.mk index d208cd3180bd..bd4d2bac5176 100644 --- a/lang/rust/platform.mk +++ b/lang/rust/platform.mk @@ -1,4 +1,4 @@ -# $NetBSD: platform.mk,v 1.9 2021/04/23 08:52:12 nia Exp $ +# $NetBSD: platform.mk,v 1.10 2021/05/26 09:21:39 he Exp $ # This file encodes whether a given platform has support for rust. @@ -7,34 +7,20 @@ .if !defined(PLATFORM_SUPPORTS_RUST) -.include "../../mk/bsd.fast.prefs.mk" - -# Bootstraps built for NetBSD 8.0 -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-7].*) -RUST_PLATFORMS+= NetBSD-*-i386 -RUST_PLATFORMS+= NetBSD-*-x86_64 -RUST_PLATFORMS+= NetBSD-*-powerpc -RUST_PLATFORMS+= NetBSD-*-sparc64 -.endif - -# Bootstraps built for NetBSD 9.0 -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) -RUST_PLATFORMS+= NetBSD-*-earmv7hf -RUST_PLATFORMS+= NetBSD-*-aarch64 -.endif - -RUST_PLATFORMS+= FreeBSD-*-x86_64 -RUST_PLATFORMS+= Darwin-*-x86_64 -RUST_PLATFORMS+= Linux-*-i386 -RUST_PLATFORMS+= Linux-*-x86_64 -RUST_PLATFORMS+= SunOS-*-x86_64 +# Rust needs NetBSD>7 +. for rust_arch in aarch64 aarch64_be 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 . for rust_platform in ${RUST_PLATFORMS} . if !empty(MACHINE_PLATFORM:M${rust_platform}) PLATFORM_SUPPORTS_RUST= yes . endif . endfor - PLATFORM_SUPPORTS_RUST?= no .endif # !defined(PLATFORM_SUPPORTS_RUST)