Tue Nov 15 23:11:14 2022 UTC ()
rust: update to version 1.64.0.

Pkgsrc changes:
 * This package now contains rust-analyzer, so implicitly
   conflicts with that pkgsrc package.  The same goes for
   the rust-src package.
 * Add NetBSD/arm6 port
 * Add unfinished NetBSD/mipsel port
 * Revert the use of the internal LLVM,
   should now build with the new pkgsrc LLVM (15).
 * Add depndence on compat80 for sparc64 to fix the build
 * Adapt patches
 * Add CHECK_INTERPRETER_SKIP for a few (mostly unused) files.
   (A proper fix may come later.)

Upstream changes:

Version 1.64.0 (2022-09-22)
===========================

Language
--------
- [Unions with mutable references or tuples of allowed types are
  now allowed](https://github.com/rust-lang/rust/pull/97995/)

- It is now considered valid to deallocate memory pointed to by a
  shared reference `&T` [if every byte in `T` is inside an
  `UnsafeCell`](https://github.com/rust-lang/rust/pull/98017/)

- Unused tuple struct fields are now warned against in an
  allow-by-default lint, [`unused_tuple_struct_fields`]
  (https://github.com/rust-lang/rust/pull/95977/), similar to the
  existing warning for unused struct fields. This lint will become
  warn-by-default in the future.

Compiler
--------
- [Add Nintendo Switch as tier 3 target]
  (https://github.com/rust-lang/rust/pull/88991/)
  - Refer to Rust's [platform support page][platform-support-doc] for more
    information on Rust's tiered platform support.
- [Only compile `#[used]` as llvm.compiler.used for ELF targets]
  (https://github.com/rust-lang/rust/pull/93718/)
- [Add the `--diagnostic-width` compiler flag to define the terminal width.]
  (https://github.com/rust-lang/rust/pull/95635/)
- [Add support for link-flavor `rust-lld` for iOS, tvOS and watchOS]
  (https://github.com/rust-lang/rust/pull/98771/)

Libraries
---------
- [Remove restrictions on compare-exchange memory ordering.]
  (https://github.com/rust-lang/rust/pull/98383/)
- You can now `write!` or `writeln!` into an `OsString`: [Implement
  `fmt::Write` for `OsString`](https://github.com/rust-lang/rust/pull/97915/)
- [Make RwLockReadGuard covariant]
  (https://github.com/rust-lang/rust/pull/96820/)
- [Implement `FusedIterator` for `std::net::[Into]Incoming`]
  (https://github.com/rust-lang/rust/pull/97300/)
- [`impl<T: AsRawFd> AsRawFd for {Arc,Box}<T>`]
  (https://github.com/rust-lang/rust/pull/97437/)
- [`ptr::copy` and `ptr::swap` are doing untyped copies]
  (https://github.com/rust-lang/rust/pull/97712/)
- [Add cgroupv1 support to `available_parallelism`]
  (https://github.com/rust-lang/rust/pull/97925/)
- [Mitigate many incorrect uses of `mem::uninitialized`]
  (https://github.com/rust-lang/rust/pull/99182/)

Stabilized APIs
---------------
- [`future::IntoFuture`]
  (https://doc.rust-lang.org/stable/std/future/trait.IntoFuture.html)
- [`future::poll_fn`]
  (https://doc.rust-lang.org/stable/std/future/fn.poll_fn.html)
- [`task::ready!`]
  (https://doc.rust-lang.org/stable/std/task/macro.ready.html)
- [`num::NonZero*::checked_mul`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_mul)
- [`num::NonZero*::checked_pow`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_pow)
- [`num::NonZero*::saturating_mul`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_mul)
- [`num::NonZero*::saturating_pow`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_pow)
- [`num::NonZeroI*::abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.abs)
- [`num::NonZeroI*::checked_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.checked_abs)
- [`num::NonZeroI*::overflowing_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.overflowing_abs)
- [`num::NonZeroI*::saturating_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.saturating_abs)
- [`num::NonZeroI*::unsigned_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.unsigned_abs)
- [`num::NonZeroI*::wrapping_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.wrapping_abs)
- [`num::NonZeroU*::checked_add`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_add)
- [`num::NonZeroU*::checked_next_power_of_two`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_next_power_of_two)
- [`num::NonZeroU*::saturating_add`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_add)
- [`os::unix::process::CommandExt::process_group`]
  (https://doc.rust-lang.org/stable/std/os/unix/process/trait.CommandExt.html#tymethod.process_group)
- [`os::windows::fs::FileTypeExt::is_symlink_dir`]
  (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_dir)
- [`os::windows::fs::FileTypeExt::is_symlink_file`]
  (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_file)

These types were previously stable in `std::ffi`, but are now also
available in `core` and `alloc`:

- [`core::ffi::CStr`]
  (https://doc.rust-lang.org/stable/core/ffi/struct.CStr.html)
- [`core::ffi::FromBytesWithNulError`]
  (https://doc.rust-lang.org/stable/core/ffi/struct.FromBytesWithNulError.html)
- [`alloc::ffi::CString`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.CString.html)
- [`alloc::ffi::FromVecWithNulError`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.FromVecWithNulError.html)
- [`alloc::ffi::IntoStringError`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.IntoStringError.html)
- [`alloc::ffi::NulError`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.NulError.html)

These types were previously stable in `std::os::raw`, but are now
also available in `core::ffi` and `std::ffi`:

- [`ffi::c_char`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_char.html)
- [`ffi::c_double`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_double.html)
- [`ffi::c_float`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_float.html)
- [`ffi::c_int`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_int.html)
- [`ffi::c_long`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_long.html)
- [`ffi::c_longlong`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_longlong.html)
- [`ffi::c_schar`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_schar.html)
- [`ffi::c_short`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_short.html)
- [`ffi::c_uchar`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_uchar.html)
- [`ffi::c_uint`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_uint.html)
- [`ffi::c_ulong`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_ulong.html)
- [`ffi::c_ulonglong`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_ulonglong.html)
- [`ffi::c_ushort`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_ushort.html)

These APIs are now usable in const contexts:

- [`slice::from_raw_parts`]
  (https://doc.rust-lang.org/stable/core/slice/fn.from_raw_parts.html)

Cargo
-----
- [Packages can now inherit settings from the workspace so that
  the settings can be centralized in one place.]
  (https://github.com/rust-lang/cargo/pull/10859) See
  [`workspace.package`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacepackage-table)
  and
  [`workspace.dependencies`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacedependencies-table)
  for more details on how to define these common settings.
- [Cargo commands can now accept multiple `--target` flags to build
  for multiple targets at once]
  (https://github.com/rust-lang/cargo/pull/10766), and the
  [`build.target`](https://doc.rust-lang.org/nightly/cargo/reference/config.html#buildtarget)
  config option may now take an array of multiple targets.
- [The `--jobs` argument can now take a negative number to count
  backwards from the max CPUs.]
  (https://github.com/rust-lang/cargo/pull/10844)
- [`cargo add` will now update `Cargo.lock`.]
  (https://github.com/rust-lang/cargo/pull/10902)
- [Added](https://github.com/rust-lang/cargo/pull/10838) the
  [`--crate-type`](https://doc.rust-lang.org/nightly/cargo/commands/cargo-rustc.html#option-cargo-rustc---crate-type)
  flag to `cargo rustc` to override the crate type.
- [Significantly improved the performance fetching git dependencies from GitHub
  when using a hash in the `rev` field.]
  (https://github.com/rust-lang/cargo/pull/10079)

Misc
----
- [The `rust-analyzer` rustup component is now available on the stable channel.]
  (https://github.com/rust-lang/rust/pull/98640/)

Compatibility Notes
-------------------
- The minimum required versions for all `-linux-gnu` targets are
  now at least kernel 3.2 and glibc 2.17, for targets that previously
  supported older versions: [Increase the minimum linux-gnu
  versions](https://github.com/rust-lang/rust/pull/95026/)
- [Network primitives are now implemented with the ideal Rust
  layout, not the C system layout]
  (https://github.com/rust-lang/rust/pull/78802/). This can
  cause problems when transmuting the types.
- [Add assertion that `transmute_copy`'s `U` is not larger than `T`]
  (https://github.com/rust-lang/rust/pull/98839/)
- [A soundness bug in `BTreeMap` was fixed]
  (https://github.com/rust-lang/rust/pull/99413/) that allowed data
  it was borrowing to be dropped before the container.
- [The Drop behavior of C-like enums cast to ints has changed]
  (https://github.com/rust-lang/rust/pull/96862/). These are already
  discouraged by a compiler warning.
- [Relate late-bound closure lifetimes to parent fn in NLL]
  (https://github.com/rust-lang/rust/pull/98835/)
- [Errors at const-eval time are now in future incompatibility reports]
  (https://github.com/rust-lang/rust/pull/97743/)
- On the `thumbv6m-none-eabi` target, some incorrect `asm!` statements
  were erroneously accepted if they used the high registers (r8 to
  r14) as an input/output operand. [This is no longer accepted]
  (https://github.com/rust-lang/rust/pull/99155/).
- [`impl Trait` was accidentally accepted as the associated type
  value of return-position `impl Trait`]
  (https://github.com/rust-lang/rust/pull/97346/), without
  fulfilling all the trait bounds of that associated type, as long
  as the hidden type satisfies said bounds. This has been fixed.

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

These changes do not affect any public interfaces of Rust, but they
represent significant improvements to the performance or internals
of rustc and related tools.

- Windows builds now use profile-guided optimization, providing
  10-20% improvements to compiler performance: [Utilize PGO for
  windows x64 rustc dist builds]
  (https://github.com/rust-lang/rust/pull/96978/)
- [Stop keeping metadata in memory before writing it to disk]
  (https://github.com/rust-lang/rust/pull/96544/)
- [compiletest: strip debuginfo by default for mode=ui]
  (https://github.com/rust-lang/rust/pull/98140/)
- Many improvements to generated code for derives, including
  performance improvements:
  - [Don't use match-destructuring for derived ops on structs.]
    (https://github.com/rust-lang/rust/pull/98446/)
  - [Many small deriving cleanups]
    (https://github.com/rust-lang/rust/pull/98741/)
  - [More derive output improvements]
    (https://github.com/rust-lang/rust/pull/98758/)
  - [Clarify deriving code](https://github.com/rust-lang/rust/pull/98915/)
  - [Final derive output improvements]
    (https://github.com/rust-lang/rust/pull/99046/)
  - [Stop injecting `#[allow(unused_qualifications)]` in generated
    `derive` implementations](https://github.com/rust-lang/rust/pull/99485/)
  - [Improve `derive(Debug)`](https://github.com/rust-lang/rust/pull/98190/)
- [Bump to clap 3](https://github.com/rust-lang/rust/pull/98213/)
- [fully move dropck to mir](https://github.com/rust-lang/rust/pull/98641/)
- [Optimize `Vec::insert` for the case where `index == len`.]
  (https://github.com/rust-lang/rust/pull/98755/)
- [Convert rust-analyzer to an in-tree tool]
  (https://github.com/rust-lang/rust/pull/99603/)


(he)
diff -r1.272 -r1.273 pkgsrc/lang/rust/Makefile
diff -r1.8 -r1.9 pkgsrc/lang/rust/cross.mk
diff -r1.152 -r1.153 pkgsrc/lang/rust/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/rust/do-cross.mk
diff -r1.29 -r1.30 pkgsrc/lang/rust/options.mk
diff -r1.8 -r1.9 pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
diff -r1.8 -r1.9 pkgsrc/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
diff -r1.8 -r1.9 pkgsrc/lang/rust/patches/patch-library_unwind_build.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mipsel__unknown__netbsd.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbea_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbeam-epch-0.9.6_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbeam-epoch-0.9.8_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbeam-queue_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbeam-utils-0.8.0_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_kqueue_src_time.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mips.rs
diff -r0 -r1.1 pkgsrc/lang/rust/patches/patch-vendor_valuable_no__atomic.rs
diff -r1.10 -r1.11 pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
diff -r1.10 -r1.11 pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
diff -r1.5 -r1.6 pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs
diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-src_bootstrap_compile.rs
diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
diff -r1.15 -r1.16 pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py
diff -r1.23 -r1.24 pkgsrc/lang/rust/patches/patch-src_bootstrap_builder.rs
diff -r1.17 -r1.18 pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs
diff -r1.11 -r1.12 pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
diff -r1.7 -r1.8 pkgsrc/lang/rust/patches/patch-vendor_cc_src_lib.rs
diff -r1.7 -r1.8 pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
diff -r1.7 -r1.8 pkgsrc/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
diff -r1.2 -r0 pkgsrc/lang/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -r1.3 -r1.4 pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs

cvs diff -r1.272 -r1.273 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2022/11/11 17:36:39 1.272
+++ pkgsrc/lang/rust/Makefile 2022/11/15 23:11:14 1.273
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.272 2022/11/11 17:36:39 he Exp $ 1# $NetBSD: Makefile,v 1.273 2022/11/15 23:11:14 he Exp $
2 2
3DISTNAME= rustc-1.63.0-src 3DISTNAME= rustc-1.64.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 1 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= https://static.rust-lang.org/dist/ 6MASTER_SITES= https://static.rust-lang.org/dist/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.rust-lang.org/ 9HOMEPAGE= https://www.rust-lang.org/
11COMMENT= Safe, concurrent, practical language 10COMMENT= Safe, concurrent, practical language
12LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
13 12
14CONFLICTS+= rust-bin-[0-9]* 13CONFLICTS+= rust-bin-[0-9]*
15 14
16# LLVM uses gcc7, follow suit. Also, uses -std=c++14 15# LLVM uses gcc7, follow suit. Also, uses -std=c++14
17GCC_REQD+= 7 16GCC_REQD+= 7
18 17
@@ -94,49 +93,79 @@ MAKE_JOBS_SAFE= yes @@ -94,49 +93,79 @@ MAKE_JOBS_SAFE= yes
94.if !empty(rust.BUILD_TARGET) 93.if !empty(rust.BUILD_TARGET)
95BUILD_TARGET= ${rust.BUILD_TARGET} 94BUILD_TARGET= ${rust.BUILD_TARGET}
96.endif 95.endif
97 96
98.if !empty(TARGET) 97.if !empty(TARGET)
99# Use "dist" build target for cross compile of bootstrap 98# Use "dist" build target for cross compile of bootstrap
100BUILD_TARGET?= dist 99BUILD_TARGET?= dist
101.else 100.else
102BUILD_TARGET?= build 101BUILD_TARGET?= build
103.endif 102.endif
104 103
105.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ 104.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
106 !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \ 105 !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \
107 !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf) 106 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
 107 !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf) || \
 108 !empty(TARGET:Mmipsel-unknown-netbsd)
108# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc 109# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc
109# (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits) 110# (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits)
110# Also try to downsize the armv[67] build. 111# Also try to downsize the armv[67] build.
111CONFIGURE_ARGS+= --disable-debug 112CONFIGURE_ARGS+= --disable-debug
112CONFIGURE_ARGS+= --disable-debug-assertions 113CONFIGURE_ARGS+= --disable-debug-assertions
113CONFIGURE_ARGS+= --disable-llvm-release-debuginfo 114CONFIGURE_ARGS+= --disable-llvm-release-debuginfo
114CONFIGURE_ARGS+= --debuginfo-level=0 115CONFIGURE_ARGS+= --debuginfo-level=0
115CONFIGURE_ARGS+= --debuginfo-level-rustc=0 116CONFIGURE_ARGS+= --debuginfo-level-rustc=0
116CONFIGURE_ARGS+= --debuginfo-level-std=0 117CONFIGURE_ARGS+= --debuginfo-level-std=0
117CONFIGURE_ARGS+= --debuginfo-level-tools=0 118CONFIGURE_ARGS+= --debuginfo-level-tools=0
118CONFIGURE_ARGS+= --debuginfo-level-tests=0 119CONFIGURE_ARGS+= --debuginfo-level-tests=0
119.endif 120.endif
120 121
121# Only build the ARM target on/for this host, due to resource constraints 122# Only build the ARM target on/for this host, due to resource constraints
122.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) 123.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf)
123CONFIGURE_ARGS+= --set llvm.targets="ARM" 124CONFIGURE_ARGS+= --set llvm.targets="ARM"
124.endif 125.endif
125# When cross-building for ARM on X86, X86 needs to go along due 126# When cross-building for ARM on X86, X86 needs to go along due
126# to 2-stage build process 127# to 2-stage build process
127.if !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf) 128.if !empty(TARGET:Marmv[67]-unknown-netbsd-eabihf)
128CONFIGURE_ARGS+= --set llvm.targets="ARM;X86" 129CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
129.endif 130.endif
 131# Same for mips:
 132.if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
 133CONFIGURE_ARGS+= --set llvm.targets="Mips"
 134.endif
 135.if !empty(TARGET:Mmipsel-unknown-netbsd)
 136CONFIGURE_ARGS+= --set llvm.targets="Mips;X86"
 137.endif
 138
 139#REPLACE_SH+= library/backtrace/ci/android-sdk.sh
 140#REPLACE_SH+= library/backtrace/ci/debuglink.sh
 141#REPLACE_SH+= library/backtrace/ci/run.sh
 142#REPLACE_SH+= library/backtrace/ci/run-docker.sh
 143#REPLACE_SH+= library/stdarch/ci/style.sh
 144#REPLACE_SH+= library/stdarch/ci/run.sh
 145#REPLACE_SH+= library/stdarch/ci/run-docker.sh
 146#REPLACE_SH+= library/stdarch/ci/dox.sh
 147#
 148#REPLACE_PYTHON+=library/core/src/unicode/printable.py
 149
 150CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/backtrace/ci/android-sdk.sh
 151CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/backtrace/ci/debuglink.sh
 152CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/backtrace/ci/run.sh
 153CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/backtrace/ci/run-docker.sh
 154CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/core/src/unicode/printable.py
 155CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/stdarch/ci/style.sh
 156CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/stdarch/ci/run.sh
 157CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/stdarch/ci/run-docker.sh
 158CHECK_INTERPRETER_SKIP+=lib/rustlib/src/rust/library/stdarch/ci/dox.sh
130 159
131.if ${OPSYS} == "NetBSD" 160.if ${OPSYS} == "NetBSD"
132# This block contains information about known trouble on NetBSD and workarounds. 161# This block contains information about known trouble on NetBSD and workarounds.
133 162
134# Parallel builds failed on NetBSD due to dynamic linker locking bugs. 163# Parallel builds failed on NetBSD due to dynamic linker locking bugs.
135# \todo Explain if the build is believed to be sound if not parallel, 164# \todo Explain if the build is believed to be sound if not parallel,
136# or if a non-parallel build is merely more likely to work. 165# or if a non-parallel build is merely more likely to work.
137# 166#
138# See toolchain/54192 at 167# See toolchain/54192 at
139# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54192 168# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54192
140# which was fixed in -current on 2020-04-19: 169# which was fixed in -current on 2020-04-19:
141# http://mail-index.netbsd.org/source-changes/2020/04/16/msg116256.html 170# http://mail-index.netbsd.org/source-changes/2020/04/16/msg116256.html
142# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html 171# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html
@@ -177,194 +206,203 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--en @@ -177,194 +206,203 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--en
177.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) 206.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
178BUILDLINK_TRANSFORM+= opt:x86_64:arm64 207BUILDLINK_TRANSFORM+= opt:x86_64:arm64
179.endif 208.endif
180 209
181# 210#
182# Rust unfortunately requires itself to build. On platforms which aren't 211# Rust unfortunately requires itself to build. On platforms which aren't
183# supported by upstream (where they offer binary bootstraps), or where we do 212# supported by upstream (where they offer binary bootstraps), or where we do
184# not trust random binaries from the Internet, we need to build and provide our 213# not trust random binaries from the Internet, we need to build and provide our
185# own bootstrap. See the stage0-bootstrap below for more details. 214# own bootstrap. See the stage0-bootstrap below for more details.
186# 215#
187DISTFILES:= ${DEFAULT_DISTFILES} 216DISTFILES:= ${DEFAULT_DISTFILES}
188 217
189.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi) 218.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
190RUST_STAGE0_VER= 1.62.1 219RUST_STAGE0_VER= 1.63.0
191RUST_ARCH:= aarch64-apple-darwin 220RUST_ARCH:= aarch64-apple-darwin
192RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 221RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
193RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 222RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
194DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 223DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
195.endif 224.endif
196.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 225.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
197RUST_STAGE0_VER= 1.62.1 226RUST_STAGE0_VER= 1.63.0
198RUST_ARCH:= x86_64-apple-darwin 227RUST_ARCH:= x86_64-apple-darwin
199RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 228RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
200RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 229RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
201DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 230DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
202.endif 231.endif
203.if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi) 232.if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
204RUST_STAGE0_VER= 1.62.1 233RUST_STAGE0_VER= 1.63.0
205RUST_ARCH:= aarch64-unknown-linux-gnu 234RUST_ARCH:= aarch64-unknown-linux-gnu
206RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 235RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
207RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 236RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
208DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 237DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
209.endif 238.endif
210.if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi) 239.if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
211RUST_STAGE0_VER= 1.62.1 240RUST_STAGE0_VER= 1.63.0
212RUST_ARCH:= arm-unknown-linux-gnueabihf 241RUST_ARCH:= arm-unknown-linux-gnueabihf
213RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 242RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
214RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 243RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
215DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 244DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
216.endif 245.endif
217.if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi) 246.if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
218RUST_STAGE0_VER= 1.62.1 247RUST_STAGE0_VER= 1.63.0
219RUST_ARCH:= armv7-unknown-linux-gnueabihf 248RUST_ARCH:= armv7-unknown-linux-gnueabihf
220RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 249RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
221RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 250RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
222DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 251DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
223.endif 252.endif
224.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi) 253.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
225RUST_STAGE0_VER= 1.62.1 254RUST_STAGE0_VER= 1.63.0
226RUST_ARCH:= i686-unknown-linux-gnu 255RUST_ARCH:= i686-unknown-linux-gnu
227RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 256RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
228RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 257RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
229DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 258DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
230.endif 259.endif
231.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 260.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
232RUST_STAGE0_VER= 1.62.1 261RUST_STAGE0_VER= 1.63.0
233RUST_ARCH:= x86_64-unknown-linux-gnu 262RUST_ARCH:= x86_64-unknown-linux-gnu
234RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 263RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
235RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 264RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
236DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 265DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
237.endif 266.endif
238# 267#
239# The SunOS target defaults to illumos as that's what the current bootstraps 268# The SunOS target defaults to illumos as that's what the current bootstraps
240# are built on. If you wish to target Oracle Solaris you'll need to create an 269# are built on. If you wish to target Oracle Solaris you'll need to create an
241# x86_64-sun-solaris bootstrap and comment out the overrides. 270# x86_64-sun-solaris bootstrap and comment out the overrides.
242# 271#
243.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 272.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
244RUST_STAGE0_VER= 1.62.0 273RUST_STAGE0_VER= 1.63.0
245RUST_ARCH:= x86_64-unknown-illumos 274RUST_ARCH:= x86_64-unknown-illumos
246RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 275RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
247SITES.${RUST_STAGE0}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/ 276SITES.${RUST_STAGE0}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
248DISTFILES:= ${DISTFILES} ${RUST_STAGE0} 277DISTFILES:= ${DISTFILES} ${RUST_STAGE0}
249RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} 278RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
250# Override default "x86_64-sun-solaris" selection 279# Override default "x86_64-sun-solaris" selection
251CONFIGURE_ARGS+= --set=target.${RUST_ARCH}.llvm-config=${LLVM_CONFIG_PATH} 280CONFIGURE_ARGS+= --set=target.${RUST_ARCH}.llvm-config=${LLVM_CONFIG_PATH}
252CONFIGURE_ARGS+= --build=${RUST_ARCH} 281CONFIGURE_ARGS+= --build=${RUST_ARCH}
253CONFIGURE_ARGS+= --host=${RUST_ARCH} 282CONFIGURE_ARGS+= --host=${RUST_ARCH}
254CONFIGURE_ARGS+= --target=${RUST_ARCH} 283CONFIGURE_ARGS+= --target=${RUST_ARCH}
255.endif 284.endif
256.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 285.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
257RUST_STAGE0_VER= 1.62.1 286RUST_STAGE0_VER= 1.63.0
258RUST_ARCH:= x86_64-unknown-freebsd 287RUST_ARCH:= x86_64-unknown-freebsd
259RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 288RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
260RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 289RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
261DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 290DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
262.endif 291.endif
263.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) 292.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
264RUST_STAGE0_VER= 1.62.1 293RUST_STAGE0_VER= 1.63.0
265RUST_ARCH= i586-unknown-netbsd 294RUST_ARCH= i586-unknown-netbsd
266RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 295RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
267RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 296RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
268SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 297SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
269SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 298SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
270DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 299DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
271# Setting this changes it for every distfile, which doesn't match what is 300# Setting this changes it for every distfile, which doesn't match what is
272# currently in distinfo. 301# currently in distinfo.
273#DIST_SUBDIR= ${PKGNAME} 302#DIST_SUBDIR= ${PKGNAME}
274# For atomic ops 303# For atomic ops
275CFLAGS+= -march=i586 304CFLAGS+= -march=i586
276CONFIGURE_ARGS+= --build=${RUST_ARCH} 305CONFIGURE_ARGS+= --build=${RUST_ARCH}
277pre-build: pre-build-fix-paxctl 306pre-build: pre-build-fix-paxctl
278.PHONY: pre-build-fix-paxctl 307.PHONY: pre-build-fix-paxctl
279pre-build-fix-paxctl: 308pre-build-fix-paxctl:
280 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo 309 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
281 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc 310 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
282.endif 311.endif
283.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 312.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
284RUST_STAGE0_VER= 1.62.1 313RUST_STAGE0_VER= 1.63.0
285RUST_ARCH= x86_64-unknown-netbsd 314RUST_ARCH= x86_64-unknown-netbsd
286RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 315RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
287RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 316RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
288DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 317DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
289.endif 318.endif
290.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi) 319.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
291RUST_STAGE0_VER= 1.62.1 320RUST_STAGE0_VER= 1.63.0
292RUST_ARCH= powerpc-unknown-netbsd 321RUST_ARCH= powerpc-unknown-netbsd
293 322
294# Cross-built against NetBSD 9.0 323# Cross-built against NetBSD 9.0
295. if empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi) 324. if empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
296RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz 325RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz
297RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz 326RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz
298DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 327DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
299SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 328SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
300SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 329SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
301. endif 330. endif
302 331
303# Cross-built against NetBSD 8.0 332# Cross-built against NetBSD 8.0
304. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi) 333. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
305RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 334RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
306RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 335RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
307DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 336DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
308SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 337SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
309SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 338SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
310. endif 339. endif
311 340
312.endif 341.endif
313.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi) 342.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
314RUST_STAGE0_VER= 1.62.1 343RUST_STAGE0_VER= 1.63.0
315RUST_ARCH= aarch64-unknown-netbsd 344RUST_ARCH= aarch64-unknown-netbsd
316RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 345RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
317RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 346RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
318DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 347DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
319SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 348SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
320SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 349SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
321.endif 350.endif
322.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi) 351.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
323RUST_STAGE0_VER= 1.62.1 352RUST_STAGE0_VER= 1.63.0
324RUST_ARCH= aarch64_be-unknown-netbsd 353RUST_ARCH= aarch64_be-unknown-netbsd
325RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 354RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
326RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 355RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
327DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 356DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
328SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 357SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
329SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 358SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
330.endif 359.endif
331.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi) 360.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
332RUST_STAGE0_VER= 1.62.1 361RUST_STAGE0_VER= 1.63.0
333RUST_ARCH= sparc64-unknown-netbsd 362RUST_ARCH= sparc64-unknown-netbsd
334RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 363RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
335RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 364RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
336DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 365DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
337SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 366SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
338SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 367SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
339.endif 368.endif
340.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi) 369.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
341RUST_ARCH= armv6-unknown-netbsd-eabihf 370RUST_ARCH= armv7-unknown-netbsd-eabihf
342RUST_STAGE0_VER= 1.63.0 371RUST_STAGE0_VER= 1.63.0
343RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 372RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
344RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 373RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
345DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 374DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
346SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 375SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
347SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 376SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
348.endif 377.endif
349.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi) 378.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
350RUST_ARCH= armv7-unknown-netbsd-eabihf 379RUST_ARCH= armv6-unknown-netbsd-eabihf
351RUST_STAGE0_VER= 1.62.1 380RUST_STAGE0_VER= 1.63.0
352RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 381RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
353RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz 382RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
354DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 383DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
355SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 384SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
356SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 385SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
357.endif 386.endif
 387#.if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || make(distinfo) || make (makesum) || make(mdi)
 388#RUST_ARCH= mipsel-unknown-netbsd
 389#RUST_STAGE0_VER= 1.63.0
 390#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 391#RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 392#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 393#SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
 394#SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
 395#.endif
358 396
359# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf 397# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf
360# if you have a local bootstrap compiler. 398# if you have a local bootstrap compiler.
361.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH) 399.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH)
362NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} 400NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM}
363.else 401.else
364RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap 402RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap
365.endif 403.endif
366 404
367.if ${OPSYS} == "SunOS" 405.if ${OPSYS} == "SunOS"
368BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils 406BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils
369BUILD_DEPENDS+= gzip>=0:../../archivers/gzip 407BUILD_DEPENDS+= gzip>=0:../../archivers/gzip
370TOOLS_CREATE+= md5sum 408TOOLS_CREATE+= md5sum
@@ -377,49 +415,81 @@ SUBST_STAGE.rpath= pre-configure @@ -377,49 +415,81 @@ SUBST_STAGE.rpath= pre-configure
377SUBST_FILES.rpath+= compiler/rustc_codegen_ssa/src/back/linker.rs 415SUBST_FILES.rpath+= compiler/rustc_codegen_ssa/src/back/linker.rs
378SUBST_FILES.rpath+= compiler/rustc_target/src/spec/netbsd_base.rs 416SUBST_FILES.rpath+= compiler/rustc_target/src/spec/netbsd_base.rs
379SUBST_FILES.rpath+= src/bootstrap/builder.rs 417SUBST_FILES.rpath+= src/bootstrap/builder.rs
380SUBST_FILES.rpath+= src/bootstrap/compile.rs 418SUBST_FILES.rpath+= src/bootstrap/compile.rs
381SUBST_VARS.rpath= PREFIX 419SUBST_VARS.rpath= PREFIX
382 420
383# 421#
384# Generate list of subst entries for various .cargo-checksum.json files. These 422# Generate list of subst entries for various .cargo-checksum.json files. These
385# are all handled together in one big substitution to simplify things rather 423# are all handled together in one big substitution to simplify things rather
386# than one substitution entry per file, but are kept separate below to ease 424# than one substitution entry per file, but are kept separate below to ease
387# updating and verification. 425# updating and verification.
388# 426#
389 427
390CKSUM_CRATES+= vendor/cc-1.0.69 428CKSUM_CRATES+= vendor/cc
391CKSUMS+= 6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba 429CKSUMS+= 38970d678de0efb4b5e2978265daa8a613a1db35fc42e669621b03fc56d5b138
392CKSUMS+= dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1 430CKSUMS+= 1a5dd77a916141a3398372a99278e05cfa9ec9ff56c99325afca6a6b7375c300
393 431
394CKSUM_CRATES+= vendor/libc 432CKSUM_CRATES+= vendor/libc
395CKSUMS+= 8826303cad14a575fa8189f67c7df52a7e11f8eea0381d7d389ff8206757de9e 433CKSUMS+= cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55
396CKSUMS+= f79ec5ad2156182d51cf70d80401293da6f8277983dbdedfd2e6927133440e42 434CKSUMS+= cea54f3eb0929a12fa9c2c07e647343f28fbb6d5394ef0f8e7331959fb540fd3
397CKSUMS+= 976b07a13e195840b67c166a62318abfa9ffc8d5ebbb0358f199dd213ec98d1b 435CKSUMS+= 976b07a13e195840b67c166a62318abfa9ffc8d5ebbb0358f199dd213ec98d1b
398CKSUMS+= ee760c856bb491d885e9458fb723c53db7988ba775e59ab5b9ee8be438e69cf4 436CKSUMS+= ee760c856bb491d885e9458fb723c53db7988ba775e59ab5b9ee8be438e69cf4
399CKSUMS+= cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55 437CKSUMS+= cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55
400CKSUMS+= 683f56837b31b9f0f5bace3080c5242b86f57f71d1126e352be24af9874ab531 438CKSUMS+= b4d5e82df95afc69a931db296be1ef6f40350af60029219587f64ca600f5f53d
401 439
402CKSUM_CRATES+= vendor/lzma-sys 440CKSUM_CRATES+= vendor/lzma-sys
403CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9 441CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
404CKSUMS+= 5e252578b5d266f6a4c8dc9f71ca7a91536ccb8c5c7d7753b82f12ec886459ef 442CKSUMS+= 5e252578b5d266f6a4c8dc9f71ca7a91536ccb8c5c7d7753b82f12ec886459ef
405 443
 444CKSUM_CRATES+= vendor/cc-1.0.69
 445CKSUMS+= 6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
 446CKSUMS+= dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
 447
406CKSUM_CRATES+= vendor/stacker 448CKSUM_CRATES+= vendor/stacker
407CKSUMS+= cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e 449CKSUMS+= cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e
408CKSUMS+= 79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4 450CKSUMS+= 79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
409 451
 452CKSUM_CRATES+= vendor/kqueue
 453CKSUMS+= 900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
 454CKSUMS+= 9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
 455
 456CKSUM_CRATES+= vendor/crossbeam-utils-0.8.8
 457CKSUMS+= 71b5f78fd701ce604aa766dd3d825fa5bed774282aae4d6c31d7acb01b1b242f
 458CKSUMS+= 8fe3bafee993fe92ef421e066b4ed3b75c52efd5f8676b8950d1b868f3a7abba
 459
 460CKSUM_CRATES+= vendor/crossbeam
 461CKSUMS+= a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4
 462CKSUMS+= 1ca104253f186211d88627c66086278adf6cd8e17eaaa243b822106d5e95d637
 463
 464CKSUM_CRATES+= vendor/crossbeam-utils
 465CKSUMS+= 916ed15218bb7b75a4e0d432430e7134efd27ca43ca8a8766e0c90e89febb602
 466CKSUMS+= 9203c99b493cf333be37410484eb3a1d7f9fccf5049aa5fd6fc9b89b20f946ed
 467
 468CKSUM_CRATES+= vendor/crossbeam-epoch
 469CKSUMS+= 916ed15218bb7b75a4e0d432430e7134efd27ca43ca8a8766e0c90e89febb602
 470CKSUMS+= 9203c99b493cf333be37410484eb3a1d7f9fccf5049aa5fd6fc9b89b20f946ed
 471
 472CKSUM_CRATES+= vendor/crossbeam-queue
 473CKSUMS+= 71b5f78fd701ce604aa766dd3d825fa5bed774282aae4d6c31d7acb01b1b242f
 474CKSUMS+= 8fe3bafee993fe92ef421e066b4ed3b75c52efd5f8676b8950d1b868f3a7abba
 475
 476CKSUM_CRATES+= vendor/crossbeam-epoch-0.9.6
 477CKSUMS+= 3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467
 478CKSUMS+= 67fd5293c2f8d25fd2eaa4694198178c44e46e4db589fbf6f33459b200419e34
 479
410CKSUM_CRATES+= vendor/openssl-src 480CKSUM_CRATES+= vendor/openssl-src
411CKSUMS+= 65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196 481CKSUMS+= 40cd1069246b552b04fcdfd13eb77b3a89194192f18c426b77377a78abbfd72f
412CKSUMS+= a2fbabba485081fcad2ea712f4c1b38f111ade4c75ca61d3c8579c99aa5a173d 482CKSUMS+= 0762dfc33f22810157225d9a78415ac3df6a89d589d1937cc58f75a6611e7fc9
413 483
414SUBST_CLASSES+= cksum 484SUBST_CLASSES+= cksum
415SUBST_STAGE.cksum= pre-configure 485SUBST_STAGE.cksum= pre-configure
416.for crate in ${CKSUM_CRATES} 486.for crate in ${CKSUM_CRATES}
417SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json 487SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
418.endfor 488.endfor
419.for from to in ${CKSUMS} 489.for from to in ${CKSUMS}
420SUBST_SED.cksum+= -e 's,${from},${to},g' 490SUBST_SED.cksum+= -e 's,${from},${to},g'
421.endfor 491.endfor
422 492
423post-extract: 493post-extract:
424 set -e; \ 494 set -e; \
425 if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \ 495 if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \
@@ -592,34 +662,37 @@ stage0-bootstrap: install @@ -592,34 +662,37 @@ stage0-bootstrap: install
592 662
593.include "options.mk" 663.include "options.mk"
594 664
595# These dependencies currently use the bundled sources as they require 665# These dependencies currently use the bundled sources as they require
596# development features not yet available in released versions. 666# development features not yet available in released versions.
597# 667#
598#.include "../../devel/libgit2/buildlink3.mk" 668#.include "../../devel/libgit2/buildlink3.mk"
599#.include "../../security/libssh2/buildlink3.mk" 669#.include "../../security/libssh2/buildlink3.mk"
600#.include "../../www/http-parser/buildlink3.mk" 670#.include "../../www/http-parser/buildlink3.mk"
601#.include "../../devel/jemalloc/buildlink3.mk" 671#.include "../../devel/jemalloc/buildlink3.mk"
602 672
603## Issues specific to: bootstrap AND NetBSD follow 673## Issues specific to: bootstrap AND NetBSD follow
604 674
605# rust i386 bootstraps are built for 8.0 and still depend on libstdc++.so.8. 675# rust i386 and sparc64 bootstraps are built for 8.0
 676# and still depend on libstdc++.so.8.
606# Pull in compat80 on 9.x and newer. 677# Pull in compat80 on 9.x and newer.
607.if (!empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 678.if (!empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
608 !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)) \ 679 !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)) \
609 && empty(OS_VERSION:M8.*) 680 && empty(OS_VERSION:M8.*)
610BUILD_DEPENDS+= compat80>=0:../../emulators/compat80 681BUILD_DEPENDS+= compat80>=0:../../emulators/compat80
611.endif 682.endif
612 683
613.include "../../mk/atomic64.mk" 684.include "../../mk/atomic64.mk"
614# This is for when we build natively: 685# This is for when we build natively:
615.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ 686.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
616 !empty(MACHINE_PLATFORM:MNetBSD-*-i386) 687 !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
 688 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
617# Make libatomic library available via a unique directory: 689# Make libatomic library available via a unique directory:
618DEPENDS+= libatomic-links>=0:../../devel/libatomic-links 690DEPENDS+= libatomic-links>=0:../../devel/libatomic-links
619.endif 691.endif
620 692
621BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 693BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
622.include "../../devel/cmake/buildlink3.mk" 694.include "../../devel/cmake/buildlink3.mk"
623.include "../../devel/zlib/buildlink3.mk" 695.include "../../devel/zlib/buildlink3.mk"
624.include "../../lang/python/tool.mk" 696.include "../../lang/python/tool.mk"
 697.include "../../lang/python/application.mk"
625.include "../../mk/bsd.pkg.mk" 698.include "../../mk/bsd.pkg.mk"

cvs diff -r1.8 -r1.9 pkgsrc/lang/rust/cross.mk (expand / switch to unified diff)

--- pkgsrc/lang/rust/cross.mk 2022/10/23 14:48:31 1.8
+++ pkgsrc/lang/rust/cross.mk 2022/11/15 23:11:14 1.9
@@ -1,60 +1,63 @@ @@ -1,60 +1,63 @@
1# $NetBSD: cross.mk,v 1.8 2022/10/23 14:48:31 he Exp $ 1# $NetBSD: cross.mk,v 1.9 2022/11/15 23:11:14 he Exp $
2 2
3# These settings may be used to cross-build rust. 3# These settings may be used to cross-build rust.
4# 4#
5# They interact with the files/gcc-wrap script to pick the 5# They interact with the files/gcc-wrap script to pick the
6# right compiler for the different phases of the build, and 6# right compiler for the different phases of the build, and
7# use the headers for the target when required. Note that the 7# use the headers for the target when required. Note that the
8# cross-root tree will need to have the required binary packages 8# cross-root tree will need to have the required binary packages
9# installed (curl etc., see list of buildlink3.mk includes in main 9# installed (curl etc., see list of buildlink3.mk includes in main
10# Makefile). 10# Makefile).
11 11
12# The gcc-wrap / c++-wrap script takes CROSS_ROOT environment variable 12# The gcc-wrap / c++-wrap script takes CROSS_ROOT environment variable
13# to do a cross-build. The wrapper script assumes dest/ and tools/ 13# to do a cross-build. The wrapper script assumes dest/ and tools/
14# as a result of a cross-build of NetBSD as subdirectories of this root 14# as a result of a cross-build of NetBSD as subdirectories of this root
15#CROSS_ROOT= /u/evbarm-armv7hf 15#CROSS_ROOT= /u/evbarm-armv7hf
16#CROSS_ROOT= /u/evbarm-armv6hf 16#CROSS_ROOT= /u/evbarm-armv6hf
17#CROSS_ROOT= /u/sparc64 17#CROSS_ROOT= /u/sparc64
18#CROSS_ROOT= /u/macppc 18#CROSS_ROOT= /u/macppc
19#CROSS_ROOT= /u/9.0-macppc 19#CROSS_ROOT= /u/9.0-macppc
20#CROSS_ROOT= /u/evbarm64 20#CROSS_ROOT= /u/evbarm64
21#CROSS_ROOT= /u/evbarm64eb 21#CROSS_ROOT= /u/evbarm64eb
22#CROSS_ROOT= /u/i386 22#CROSS_ROOT= /u/i386
 23#CROSS_ROOT= /u/mipsel
23#CROSS_ROOT= / 24#CROSS_ROOT= /
24#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT} 25#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT}
25 26
26# The GNU cross target designation 27# The GNU cross target designation
27#GNU_CROSS_TARGET= armv7--netbsdelf-eabihf 28#GNU_CROSS_TARGET= armv7--netbsdelf-eabihf
28#GNU_CROSS_TARGET= armv6--netbsdelf-eabihf 29#GNU_CROSS_TARGET= armv6--netbsdelf-eabihf
29#GNU_CROSS_TARGET= sparc64--netbsd 30#GNU_CROSS_TARGET= sparc64--netbsd
30#GNU_CROSS_TARGET= powerpc--netbsd 31#GNU_CROSS_TARGET= powerpc--netbsd
31#GNU_CROSS_TARGET= aarch64--netbsd 32#GNU_CROSS_TARGET= aarch64--netbsd
32#GNU_CROSS_TARGET= aarch64_be--netbsd 33#GNU_CROSS_TARGET= aarch64_be--netbsd
33#GNU_CROSS_TARGET= i486--netbsdelf 34#GNU_CROSS_TARGET= i486--netbsdelf
 35#GNU_CROSS_TARGET= mipsel--netbsd
34#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET} 36#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
35 37
36# To cross-build rust, you need to specify 38# To cross-build rust, you need to specify
37# the ultimate target to built for, as well as the 39# the ultimate target to built for, as well as the
38# host the compiler is supposed to run on. 40# host the compiler is supposed to run on.
39# Rust's target designation 41# Rust's target designation
40#TARGET= armv7-unknown-netbsd-eabihf 42#TARGET= armv7-unknown-netbsd-eabihf
41#TARGET= armv6-unknown-netbsd-eabihf 43#TARGET= armv6-unknown-netbsd-eabihf
42#TARGET= sparc64-unknown-netbsd 44#TARGET= sparc64-unknown-netbsd
43#TARGET= powerpc-unknown-netbsd 45#TARGET= powerpc-unknown-netbsd
44#TARGET= aarch64-unknown-netbsd 46#TARGET= aarch64-unknown-netbsd
45#TARGET= aarch64_be-unknown-netbsd 47#TARGET= aarch64_be-unknown-netbsd
46#TARGET= i686-unknown-netbsd 48#TARGET= i686-unknown-netbsd
47#TARGET= i586-unknown-netbsd 49#TARGET= i586-unknown-netbsd
 50#TARGET= mipsel-unknown-netbsd
48# 51#
49#SCRIPTS= ${WRKDIR}/scripts 52#SCRIPTS= ${WRKDIR}/scripts
50#CONFIGURE_ARGS+= --host=${TARGET} 53#CONFIGURE_ARGS+= --host=${TARGET}
51#CONFIGURE_ARGS+= --target=${TARGET} 54#CONFIGURE_ARGS+= --target=${TARGET}
52#CONFIGURE_ARGS+= --set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap 55#CONFIGURE_ARGS+= --set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
53#CONFIGURE_ARGS+= --set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap 56#CONFIGURE_ARGS+= --set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
54#CONFIGURE_ARGS+= --set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap 57#CONFIGURE_ARGS+= --set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
55# Pick one: 58# Pick one:
56#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar 59#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
57#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${SCRIPTS}/ar-wrap 60#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${SCRIPTS}/ar-wrap
58 61
59# May be required when cross-building on NetBSD 62# May be required when cross-building on NetBSD
60#MAKE_ENV+= OPENSSL_DIR=/usr 63#MAKE_ENV+= OPENSSL_DIR=/usr

cvs diff -r1.152 -r1.153 pkgsrc/lang/rust/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/rust/distinfo 2022/10/26 12:51:46 1.152
+++ pkgsrc/lang/rust/distinfo 2022/11/15 23:11:14 1.153
@@ -1,147 +1,157 @@ @@ -1,147 +1,157 @@
1$NetBSD: distinfo,v 1.152 2022/10/26 12:51:46 he Exp $ 1$NetBSD: distinfo,v 1.153 2022/11/15 23:11:14 he Exp $
2 2
3BLAKE2s (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 2732461c3d84cd516563afedc5513f377e3a6796c931ef03601fdcbcc4e6fe33 3BLAKE2s (rust-1.63.0-aarch64-apple-darwin.tar.gz) = 8b6bb1a17756ad68c516afc05fd0f2760c9608975e65399781b1fc85bd7d91bf
4SHA512 (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = e99f53fd801d09f28dfd0568a8f2e97a5c4d5d0de7bea28f5afdc91d02f27ff887627f7717c032b90af412e4c04fc11c80c91f42e4b8dab885a311d56fdd5542 4SHA512 (rust-1.63.0-aarch64-apple-darwin.tar.gz) = f8bca4ac150db2296ea1be8ef7cd887e5a9e2dfbc7a7fb4c5f8d31c539ffdf58aa9d46611a281bd718c6272a85fca2aef60d1838a9a27b0b622e9d50e33cc1e6
5Size (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 197829953 bytes 5Size (rust-1.63.0-aarch64-apple-darwin.tar.gz) = 228229488 bytes
6BLAKE2s (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 95884eba580edfe3fc8e41aa48a01d7b881e849350598358422d3e5fd20e5d55 6BLAKE2s (rust-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 58ede5121c9ee8b61edfa792771851da61b75a08e63379f9b836395e9e61bbb5
7SHA512 (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 11d32205ef962b7bd19209dc4e2627d97d97392f333f712c26f5b9b4d2ea895608e5dfbf38280e0433b9da9e5cd037a182b9ac4a744dd188540b491bd5dc19ad 7SHA512 (rust-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 04d2a917e64c66b15cda3bbe9353d61737c57eb1ee4d9a2207d976b9f8f588e447f8682c7f87cf33cbc3cf14c37195795c8f259202509d3229ce9c5c175311f4
8Size (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 226819968 bytes 8Size (rust-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 391767348 bytes
9BLAKE2s (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = d0414d0746877449f3aea03ad2ee8564d6878aa75471c9402d37fb227b0a76cf 9BLAKE2s (rust-1.63.0-aarch64-unknown-netbsd.tar.xz) = 6aa93fab83a104585c44d4bc78e4ad3e46e37ae907e2e23c5a56a11903e54876
10SHA512 (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = efc20cdab9d15d0d80ce842d10a315260932e6b8e7bf076112f85b1c2cb7526b5761b9c49571880e8818ad6f7c2ce53d379d72eb40aafc65de6e5825c7175598 10SHA512 (rust-1.63.0-aarch64-unknown-netbsd.tar.xz) = 690348f679f2d9d6af8b4ce648e6a68cd83bd724906566cdbf4a5e56e75d5aa596b5dc702807baef8296883a94bafdb0c6506a8de1f764271d07b6950a9115de
11Size (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 391230027 bytes 11Size (rust-1.63.0-aarch64-unknown-netbsd.tar.xz) = 153412536 bytes
12BLAKE2s (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 9d297948e81774780669461261048e6964e38b991301bcb1e72d002f567fe642 12BLAKE2s (rust-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 0b3fed187c6701c687e028857085f5c09fd4a93bb67b91897c938c5a52427c69
13SHA512 (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 609469f1938a6bd88089391605d708228ab760c09f2624d2c89fc2ae2f17ca466aeba96fecb7a31f5e18fc9b175b47c80ce8f425b015fe2a8fb3fd2684220c28 13SHA512 (rust-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 766344c17c59007fe3c6fdfd4caefb9bf0eec3b6c8fec878744f71979069e3edafc3b023727341f9526c7c5169b13d0fc234a0e3f5118858218149a5c7d85a08
14Size (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 153006012 bytes 14Size (rust-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 152749160 bytes
15BLAKE2s (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 98f0839e7c3886381279e9c32b9a203c5912db46c437f47f4af9f2be65ab5a11 15BLAKE2s (rust-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = dcb4cc227039a5ee59606b30e29e6172b56eb86590a248e9483d6b4234070d2d
16SHA512 (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 06e9254a8e31bba1eee83d5851a1dfdb17671863f3370325827f16cbaa9b264ab3dfdad33f4c212e5afb1a1653aa159fd34c11b3f448cc28f21c0de95f0b0950 16SHA512 (rust-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = e27cb6f86ef5c5fd4466afe37a34e09f910a0a09a7a7f98c735831a89983de83d447569165dd44c49fc6511aa37d065742748e222d03e240d519d011c5dbd73c
17Size (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 152149492 bytes 17Size (rust-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = 321731846 bytes
18BLAKE2s (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 3e6364849b34f8f8c309ff80094b3a74b6b4c3e182e554f6e1cc5b395143d450 
19SHA512 (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = aae29513d35aeb550f0e8372849d39baf868406aa30804b808fb0e13f3125694f1602c1645d2a63d2d036196e4de7b8d4fd85b3e61a87d48f29a19e62a7b2630 
20Size (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 321045815 bytes 
21BLAKE2s (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = f66caf358af54016ed655a57585025c3f91a4199ab4845132a42b61b6b40ef94 
22SHA512 (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = dd5498837e07b3f41a67f0aec6f77c5f2026cf3723b5f6931621e2d8921bacf6eed6dfa2f1d81dd6b69ac839334e0fd74201f60209da8607916a2834b5e463a9 
23Size (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 312568849 bytes 
24BLAKE2s (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 3ea6b09bfb7a4f5fbbda3977739bdad66fe1ec4a4f47cdf23379f706ee257918 
25SHA512 (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = cf6a142404aebabf9196ea39095034984bd2f6582711527e341dddc35acca23e19d5f5769bfcf99a623a2d746664621c56cc7055796bd1983df84fa5bb3864a0 
26Size (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 134947696 bytes 
27BLAKE2s (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 17aa9922d662804485cd242979ebea0c5404bc508a434c1697f2beb9150046c6 
28SHA512 (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 3169dbcd30e3bd766e3ebe896c0963ba3875683da5cf192e933903423147d6bb463fa9223990e6766c802b0a8aba52d8da099ff068bb34008ba57ba705ba1355 
29Size (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 165954144 bytes 
30BLAKE2s (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = 0fe5431cd25ca1eb5b0029d88a387934f8ce4cedc9991914561f9429c390328f 
31SHA512 (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = b0948781b4ae987f297e22dcbf81446837536af26994dfa30bd1fd5be050ed613d9f4114105c1b71cce03d3cb8e4d105e23285bf1f5cdd372b45dd63c0fb9f12 
32Size (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = 368878800 bytes 
33BLAKE2s (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = b2d8e8e82e555bccfae49c3ecb7f710e5387d2fab724aae9fe85707d2cea7e45 
34SHA512 (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = 8800cc0e387ab9a4576ef581da70cccf5b9bc5cff1889e36654ab2f05fe8f10be5b43322a4f160a7f2ab94792c3202aeaa0b3b0eacf7afbec0182fb6c3637b5a 
35Size (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = 169776912 bytes 
36BLAKE2s (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = b730c7c724860331fb3d53ec2807147acc6734c12e23419e5a950347e6e1239e 
37SHA512 (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = bbc739c9bfea90a74a06ed6afa43e6ff1ca0ed2a7a66fa25269cf6d09cfb40fce50f240d81bd8821a3c42e738d876b0e73c6b1b8b5242f399d3f907051bc3e94 
38Size (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 177559744 bytes 
39BLAKE2s (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = ffdc19c697f49dd575abe6617c658e354e73f4a77c9395275a14ebf321b3e3d1 
40SHA512 (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = 91a1a477ab0c797949610a287e6bfd23e50ce1007fa8fa69bdebb4b29de689813d093be3c6d7bcf2ba57415af92416cb741beb9377fe9bb1c2215a59c3a49c57 
41Size (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = 149239740 bytes 
42BLAKE2s (rust-1.62.1-x86_64-apple-darwin.tar.gz) = 7125c2c82f869d3f80591165bf249237770a1fa6c2b539c49e7bf5f85f232295 
43SHA512 (rust-1.62.1-x86_64-apple-darwin.tar.gz) = e97dae43eaa0fb621a68408409f3ab7f34f26f6fa9c301a3435d6a4b5dd04e9fa2fdc9bbe5aa6dd0bad6f8c72db3af89f5147cf64cbe60dcaa93c93cede3a3a5 
44Size (rust-1.62.1-x86_64-apple-darwin.tar.gz) = 291881993 bytes 
45BLAKE2s (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = b44a4316025cf81b7acc3b4d42f40cb1f0b38492089741fed6037d8fe3a2ad35 
46SHA512 (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = 160200cf8395e084c4bfc8dd403af67cbc883bce41df1337125d74044b75d6cd227ace44e3400ddcd7f0b84a9cda26657d3d9b33582490c98b93992f8cc4ae6c 
47Size (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = 287568888 bytes 
48BLAKE2s (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 7a0660bdf1e7a653686d9b6b0b3ff878b4f551f8de586fa7de03d5e89ae565fe 
49SHA512 (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 55125402c787df1c7cf10145902cd882077baa1bef032db71dbed46d1ed467f838e5d88c51753475fe84a89b61b557c895804aef134f6a0e2b016f3c7e68e164 
50Size (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 265631587 bytes 
51BLAKE2s (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = 94e420fe58a0af5359d5947774e3eb89576eeac81830dceaf884474d40f07032 
52SHA512 (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = ff1051a9152cc5706c8c6d6be6d23d73b913313bfc4e8212196f2356503f8016f26c9fc5551564a5d7063a801038ea719024dadca0cded60f47b1d7263737e72 
53Size (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = 172701916 bytes 
54BLAKE2s (rust-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 3b9eef9621283979f385c91814721099120169eb08ed9d6f769d7b04831d2ded 18BLAKE2s (rust-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 3b9eef9621283979f385c91814721099120169eb08ed9d6f769d7b04831d2ded
55SHA512 (rust-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 9a4d2c8d31ef62bb9d5bd5854503dc71587fbf6f1d0044c468a6e6de6a9c41b627c086c57b91d4bd466db7c9990a890212f9a8d6b5283c86822b58626b154e94 19SHA512 (rust-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 9a4d2c8d31ef62bb9d5bd5854503dc71587fbf6f1d0044c468a6e6de6a9c41b627c086c57b91d4bd466db7c9990a890212f9a8d6b5283c86822b58626b154e94
56Size (rust-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 152484384 bytes 20Size (rust-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 152484384 bytes
57BLAKE2s (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = a7ad0d562f59962afa64b81c70db13c6d669911a1d3a15da95325930f007b159 21BLAKE2s (rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = af2f939e619d49b2ea52628418c9e4d4e6234a37d508335d18a99ac46274e365
58SHA512 (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = 205dd929ca91999d2377ef474af557d55c18372ff1825d19ebff214903979da02058bb664bc5ffb0989b8b641642249600f2e16bbb5ce4f5b55e2500b28cbce0 22SHA512 (rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = da0b59f52de3457ab1bf5b47ed4c51b4348e9b4e85844b0698e592706367ed78d3ad12d20740c8e1a9d907116c2d18d68382769e213894ad9844ad7e027af860
59Size (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = 39464902 bytes 23Size (rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = 313156635 bytes
60BLAKE2s (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 40e29a9153706a8d899c3164899c6bd9ebf1cac35d1776a28cb9205b8f663f8e 24BLAKE2s (rust-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = e07fdec17a5292b99df1a517349a7b15c1ac2c15c2cd3d5c1620a55f2e222cf7
61SHA512 (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 0a80fb1d155d2d56b2a0ec5fa93114c67c3eafb4fa4335536eb1b883e1bccb5cf69594ead247195fa1b5e7eec7481bb35959b2b6f10e49b982d83d2152e89545 25SHA512 (rust-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = d27f655ede43e38e4a1654c3117346332da73032d8b45a5b79d8bd52ae20acc083fe263b1e32c1bb5b394a33c0b6ac7dcbdc1623da227b505c92f0744e140da3
62Size (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 56992887 bytes 26Size (rust-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = 134099348 bytes
63BLAKE2s (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = b1525521d522b64edb248223d78584b3ed4d9b63608b7f1c0c3f06ba76ebf95d 27BLAKE2s (rust-1.63.0-i586-unknown-netbsd.tar.xz) = 4dd319d183bdcf209c47887f54288c1ad92893c25127ae0fc1a6a1c29812f868
64SHA512 (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = 764a3479a197ec77a3f4ca9c1ed03c79616ae49518e696d7caa8672806356439108779e6ab92b6bc1a86c8d14aea06bbaab4bbf802bcfe4d2c00679e0ecd429e 28SHA512 (rust-1.63.0-i586-unknown-netbsd.tar.xz) = 6fd39e5e55d9baf3645ff241ac1be63290419533bec6fb9ab0e68a9e0897559195c07ecdfc807dd0a6b1c7ddbfa5d23faff3276e1036cb43fa8c047582f3f466
65Size (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = 22650524 bytes 29Size (rust-1.63.0-i586-unknown-netbsd.tar.xz) = 165878492 bytes
66BLAKE2s (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 3010fa11f7ee3f45c6c421372f45f98a633265638e596ed67468256d1946e0d4 30BLAKE2s (rust-1.63.0-i686-unknown-linux-gnu.tar.gz) = b194a05fc85145bd16a30d9204598a270db509c3a9597eb929a1681c7d43425c
67SHA512 (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = deeec40da779492ee73494de41949c8f5f0670e4a3fa163d1393a36ec3d9d6ef13946b18ed37e83363fe3f0d7560a8922f6ee3158b11a8a9f4693db99d13cacc 31SHA512 (rust-1.63.0-i686-unknown-linux-gnu.tar.gz) = 759d0bcb79bcbc38a49dbdf9c7611c7d520910b8de6f07939d76140ea6c4178ba6fc80367d399482c2989160b213ac3b26107344996b7cb06cf8d67609fb9ba9
68Size (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 22464008 bytes 32Size (rust-1.63.0-i686-unknown-linux-gnu.tar.gz) = 369810939 bytes
69BLAKE2s (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = b7f165cddba9d738a372cc0905bb80ae1c8b0ea85c255a72b7fe5d9387d74ab3 33BLAKE2s (rust-1.63.0-powerpc-unknown-netbsd.tar.xz) = d4d4b8b369e7c3a2ffe72d66963086e9b35165c97611dd825a05b95d3b2b8f7e
70SHA512 (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 49b90056ca67cdb0bb8c9a5803c6074bd620c964037d71fbb1de4cecdc6dd9f655e0e66ba605db3af783a62eb863eadacc1275b1103ac03559ddb1290b50a1ed 34SHA512 (rust-1.63.0-powerpc-unknown-netbsd.tar.xz) = eeb03a94ded0ee104d5bddf8b370a064ff0ea082228ff621ed19f22fee6cc2a61b79d99b7fc257a5d86666e46a0ff1298a30e62e13a4b47ad1a15cf454e4a3ae
71Size (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 35692832 bytes 35Size (rust-1.63.0-powerpc-unknown-netbsd.tar.xz) = 169274792 bytes
72BLAKE2s (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 69d4685e118e25bf65bfc22675bc6fc6906f35ba475a8eb34e09f0a8d94e7bee 36BLAKE2s (rust-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 3464e8f6a823eddaea3fbcb0c8b6cf629df73f12f2121ddc21ed45185ed6a3f7
73SHA512 (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 665f0b49572017ef9035acdd587df02b779053ee288660c25410fc01cd4ad76c01754fec9573c2ef699642c6b65a1c195447ca06399cbe2ec29e489c84390d94 37SHA512 (rust-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 90c5facc452705d2edc87f14b02d117443dadb476d0b02328849a4efc5bbc0520fd3c346112547e3b398dab04601919fdc9f1eec285c6ff5d1e07329d78c35ce
74Size (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 37547880 bytes 38Size (rust-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 177793992 bytes
75BLAKE2s (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 116abcf083beaf6592a7b268694cd22005c81871a6c6d28d2784a6eb51b7ca83 39BLAKE2s (rust-1.63.0-sparc64-unknown-netbsd.tar.xz) = 3251a4e4303b1e57d0239e9cb1f49e72354ab9633ec4a729776d651db0856e58
76SHA512 (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = aba210f8bbaadaf365e72fbbceb7ac862c06fe01e9be5c4de04b5420f1c17097f5197b7e1475ee36690fad46419e0400adc8473ae4906a48ade069e34fe5eeb2 40SHA512 (rust-1.63.0-sparc64-unknown-netbsd.tar.xz) = c9da3d518ece8596ea6f8fe3f69c6623735e0876d3ceb587a885c5a02939bf00fa794dad4d1d081b0916251186b2941ac3185b70d611c58bccaa4893d822c59d
77Size (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 21749880 bytes 41Size (rust-1.63.0-sparc64-unknown-netbsd.tar.xz) = 149584036 bytes
78BLAKE2s (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 4aab9d204a04b9ab9fa54416161730330404cbf4ece0fd7de0094570941b5609 42BLAKE2s (rust-1.63.0-x86_64-apple-darwin.tar.gz) = 7f12ec36e0deade8f9536c3dc55465afd78e0d8388e5c6b46cb7f3a8092a807d
79SHA512 (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 9289ecea292a1e29e2b420185cc8445bcefcadf50ff0069a4b49a2e8364b70052925d59d05c5c1427a43e0d85357219c95723ffc4df82041954fd8074b0267dc 43SHA512 (rust-1.63.0-x86_64-apple-darwin.tar.gz) = 241f230c6eba6b21eb5a34745b31ab979ea757bef02c86625f6641c0e6579173a5ab29aafc724372a33c6c2d5b741a4861cbc2520cb80242400f8086ed4d32c1
80Size (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 22647628 bytes 44Size (rust-1.63.0-x86_64-apple-darwin.tar.gz) = 293106442 bytes
81BLAKE2s (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 61ef685652975dce70e0df29c0f0cdcb768f4762102fc1dbaaa39fe99f7e16b7 45BLAKE2s (rust-1.63.0-x86_64-unknown-freebsd.tar.gz) = eab6148a4ef45c7ce78f10873db3e90ba9cc424f161e3fc7518337e99556998b
82SHA512 (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 1b151013827bc9ced16589bb8ea379a292ad0343236a48f4d7ad945b71c4e50ab2c269c440c0fbdcaa28fccb379449c7958f7f0bc70ff7e7aa3d0777f1d6c668 46SHA512 (rust-1.63.0-x86_64-unknown-freebsd.tar.gz) = 33652c6e1db7aed358f9fd63fc5e0c10755a558f264a90b6180245c1b95a4292ed201af91c78f9b8b030a55e7d6eb5f2d67823a1770b780ace5ac2da67806dca
83Size (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 39451796 bytes 47Size (rust-1.63.0-x86_64-unknown-freebsd.tar.gz) = 288166502 bytes
84BLAKE2s (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = 4d2341868558edc8cdd59d8244dc4e7c9ff3170eb347b382ddf84daf8367cf84 48BLAKE2s (rust-1.63.0-x86_64-unknown-illumos.tar.gz) = 7844914d1a21e8df16bc2a7aad5f01d8502a79806f4606edf2edc7fa38d7f6e5
85SHA512 (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = ab05aa5b6b34608e2b72266d0b2d9c937be727dc2a914ae4ab83a00c50c89927e85c3f3fe34e82131aca3d7c40835da791c4eb6afba3558f55c6518b82dbb770 49SHA512 (rust-1.63.0-x86_64-unknown-illumos.tar.gz) = 1279e4cb7dce1e23cdf8b40afa3540c60e24f22e41a02acd0985cdfa13d825d09ba92859e138734ab2f8435808b4e61c510006a4aba75a02f6b3a45b9bafe556
86Size (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = 20522208 bytes 50Size (rust-1.63.0-x86_64-unknown-illumos.tar.gz) = 201958566 bytes
87BLAKE2s (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = b5fd541cb5ed7d6ec45e3ac122521d3268129a6a54a6f545118ed703170c310a 51BLAKE2s (rust-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 9ea24101e32efb791fe30f9639b92f705b55c1cb72017a15adada51dd33fe48c
88SHA512 (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 9fbc7ec69db6652f80c1e5f9fe5f087e3fa82d25c0f6c0137af4d7020a208175a8372d0ae0e407c3b67fee8eb5319a3f41746de97f3be95ceb443e401733207e 52SHA512 (rust-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 84a680e7dbf7025490d6681eb49e540acae2f02b32f9762593e92811824300b61862c72671f8288c59483716b3e8a53324714738234e7baf452f75921c751b48
89Size (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 20519232 bytes 53Size (rust-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 267333435 bytes
90BLAKE2s (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = 8f9c9961e18d345893d8a8e37324883de682d08049a91ed321aef123fae3b0f2 54BLAKE2s (rust-1.63.0-x86_64-unknown-netbsd.tar.xz) = cd865da1c25e3915a8dd8b66554072a550e52ed6dbc284a11f335b49cba52ea3
91SHA512 (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = e9a355ecc772acc90d382c5333e6b5195a91b284a9f4a4c68a6fe8e8805ac2505bd68191f34c0e3332a4ee2577e324aff7055257eb562b139552d91c8217bcb7 55SHA512 (rust-1.63.0-x86_64-unknown-netbsd.tar.xz) = 046431fc3382994e42b1755f6ead2e124ffe92ce5df1638bbf6c14d9e5a4bd56bd960d775b49e91dc2573bd3995178e926b719d20a2be223f029b17c3587f536
92Size (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = 20607296 bytes 56Size (rust-1.63.0-x86_64-unknown-netbsd.tar.xz) = 173189252 bytes
93BLAKE2s (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 24589c5da00d22c1727eaf7149ea613e6216d8e81be55971fe2a95afa7c21c6a 57BLAKE2s (rust-std-1.63.0-aarch64-apple-darwin.tar.gz) = 7cbda155876eaff413ca9574dbe90909fd6fd00d4dad40494c03d7a75a519276
94SHA512 (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 7693dbcd780fee8b2f4372f86ca1c0c3620280cf3b20ee9bf155ff32e410a7faa263545b5a8f51b1e77597eeb5b357dd070fe95e1f132db92bcc38afcbd3d4a4 58SHA512 (rust-std-1.63.0-aarch64-apple-darwin.tar.gz) = 44252454d3932476675a971fda6a7c01560a372d9dfb51f64ef7d3d53971715bb1a39b09a2cb43cdd6639af2857cf278c4206728e85f6fb68d679ef4ea42f44b
95Size (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 40146874 bytes 59Size (rust-std-1.63.0-aarch64-apple-darwin.tar.gz) = 39776510 bytes
96BLAKE2s (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = aff2086bb0de53f4e5af1d54798d872dad6ef67ee56a97a78eefad39fe82dfe8 60BLAKE2s (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = d48310db4c8934aac0b039e9c40feb5dec29366956ee6c24a27c3bbede37e8e4
97SHA512 (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = 4de5cd33c06430fbd77f484baa440508aacb62252995bee56dd4653855312c1b438e2005941411a89613ea247413b311fd60b235fd30c13253fcd291ccfd2dab 61SHA512 (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 10a8fe1fee134a201393ae5bf0221f599722156d0139bb75175fd10611941f032fe2899d2a256ce708390b0a5a185d045b53cf5cf52fd9ab67da43605a8b9012
98Size (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = 42381072 bytes 62Size (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 57250791 bytes
99BLAKE2s (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 578e330e17e1cd7d5c5ee632a53a980ab5ce3669f13a480896e1033f4c1d3832 63BLAKE2s (rust-std-1.63.0-aarch64-unknown-netbsd.tar.xz) = 5b4c8c7c7e1a7e6d151d30cceacb8dc7cb686305c9b67ac6d7a3334958b0ecf7
100SHA512 (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 912cb0b0f3bfe296300ca9764ea3695716e674600ada36a7252a7e5fceadff2afca65f6a3aac80e3303425e177ecf1b0db1dcfc48aad0eb573f1d2db112e6692 64SHA512 (rust-std-1.63.0-aarch64-unknown-netbsd.tar.xz) = 1b67a4e5089eae4a092eee248b215621a80f381879682fe629b62fc293e32965c0b18534642ded510abada0bff6f831f5937220eed2360d9e2e38b5924a4d1bf
101Size (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 43773106 bytes 65Size (rust-std-1.63.0-aarch64-unknown-netbsd.tar.xz) = 22653612 bytes
102BLAKE2s (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = 99769fb8e8fd92d22e53227ded03d207c4ddeabf1cfb3f1088edfc637727e2be 66BLAKE2s (rust-std-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = c45ee00c8cd3b6636d58128982f0d57a1e4729c8062791c735518db1c9b5bde0
103SHA512 (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = d72824448ce83c94ec2b559a5fc769c8a8441293df4ca9b491e91ee1c42c0159ec8e2bbc9eaaa68e2d31b889a257d8d5743ef62ec10786caf5f017a8c5e3eca2 67SHA512 (rust-std-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 0a142992f084367750bb479fb4ff8694f4ee4256e6f0181815246c6b1ea64320a599da5563642927bc67a6f2ded959c456f45987ffe28c90438388d3c7e9b513
104Size (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = 25464592 bytes 68Size (rust-std-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 22614832 bytes
 69BLAKE2s (rust-std-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = 9d08ca076d966386b7cbf23aa72f5aeac47600686d105eeca7363867cf4eec66
 70SHA512 (rust-std-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = dd14e86345ffcd6a19c5640c893d941efe70f0f98d226cf76b7d630c4cf56112c2202e908584d17afe15fc85b01b1be7a603ed67da4ba1334254a48ea07b0b4e
 71Size (rust-std-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = 35898004 bytes
105BLAKE2s (rust-std-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 5b6725f8eadbd72384b6fcb6db57710a6bee114dd97aedbcad3427524068e0d1 72BLAKE2s (rust-std-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 5b6725f8eadbd72384b6fcb6db57710a6bee114dd97aedbcad3427524068e0d1
106SHA512 (rust-std-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = fda6ce37ec784eb5a9f57674088ac34d7100dab3a024f44f3eeac04dc3502ac31550e400edcf1c4b5356ed33abf8d3e2b0dc7470d76815a44935672ec0380925 73SHA512 (rust-std-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = fda6ce37ec784eb5a9f57674088ac34d7100dab3a024f44f3eeac04dc3502ac31550e400edcf1c4b5356ed33abf8d3e2b0dc7470d76815a44935672ec0380925
107Size (rust-std-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 20757660 bytes 74Size (rust-std-1.63.0-armv6-unknown-netbsd-eabihf.tar.xz) = 20757660 bytes
108BLAKE2s (rustc-1.63.0-src.tar.gz) = 0fd32c49a5e919cc01a7f8faefe66132c4462b5a1275115427ec879c007da894 75BLAKE2s (rust-std-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = d54b985d08493510a1fc84084b91b68f3b407d449e9bdfa5fbd379b876e033f5
109SHA512 (rustc-1.63.0-src.tar.gz) = 8c4ce20f0e6ddf86c13e24f222846dbcddc6b8fccc5490b1c41877df3ecf2543bf5fd88431d2e6d23280f90c0395f0d812b4ad7c13098128b043669660911299 76SHA512 (rust-std-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = b97e3d076a04405890f1540b866d5787ee61cbdbc5fc6b45a6814ccda38276d59c809a2a9fa9a4ed77b07210cf1b7ce4a2f362e65211e803b3107c8aa95cb59b
110Size (rustc-1.63.0-src.tar.gz) = 203449048 bytes 77Size (rust-std-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = 37741784 bytes
111SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a9a891b9c507958354fb819587d6d4b31ff83ce6 78BLAKE2s (rust-std-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = e37494b5e764b30b081ee73c1275a488270092d4ab9e263483131fd9ca70982a
112SHA1 (patch-compiler_rustc__llvm_build.rs) = bcc6ed331eebf0589a100d53b29182659596d90b 79SHA512 (rust-std-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = a9920722c8739478a617c93504b06f615865297d87921c1faa8d8da7b2ff95be3cfcd2b2417e6b7ec8e81ef31e5e0396ca65f8e3b4cf19cb73e387b55d2d330e
 80Size (rust-std-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = 21831664 bytes
 81BLAKE2s (rust-std-1.63.0-i586-unknown-netbsd.tar.xz) = 564b67526782d80c9962d2bdbcbb631642a526eb0b157264c996ba83f7aa1fc2
 82SHA512 (rust-std-1.63.0-i586-unknown-netbsd.tar.xz) = 269f53d2d197578febef3d96f9feaa2e7f3e098fc0d52e8a85b65530e859943a535904c33f2bbda1631d71e5de921caebda2b616134940e0a6072b1c196c16b6
 83Size (rust-std-1.63.0-i586-unknown-netbsd.tar.xz) = 22699044 bytes
 84BLAKE2s (rust-std-1.63.0-i686-unknown-linux-gnu.tar.gz) = 5f0e031fbbbf54670535b083165d3d452de4e0588849f9dfb71ed74663402d10
 85SHA512 (rust-std-1.63.0-i686-unknown-linux-gnu.tar.gz) = e862660fd94fe3d9b30df994e95247d3ab7b6a4943098e910f2824026cfaf6df0a44afd6950074d80e94e6f0cfa3bde95660a765d6c5c31fc0a742f6818569d0
 86Size (rust-std-1.63.0-i686-unknown-linux-gnu.tar.gz) = 39728937 bytes
 87BLAKE2s (rust-std-1.63.0-powerpc-unknown-netbsd.tar.xz) = cf467af536d5f44ca40566f8385123f54d60c7587c2f3b12d03a934ed7aa8d55
 88SHA512 (rust-std-1.63.0-powerpc-unknown-netbsd.tar.xz) = aa5f69063548875a2cad381fe5004a576376ea121c95599cef831deffb1509d05e5f1764714220de3d6c49794c1768df772789fe772f34281a7ea36cf1ad2097
 89Size (rust-std-1.63.0-powerpc-unknown-netbsd.tar.xz) = 20677128 bytes
 90BLAKE2s (rust-std-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 8a5734eda79f3d1249e3c5c6343088e5e566e6c35cf5eed9675039c54c3f630f
 91SHA512 (rust-std-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 609b321facbda65fea8cadd1b28c6c0c15d7d470bd89af61f442cc6b640e598c4c03b77adcf7f87b0545f5fb8a9da479a810fe813f72e808548c35031183b9f8
 92Size (rust-std-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 20743540 bytes
 93BLAKE2s (rust-std-1.63.0-sparc64-unknown-netbsd.tar.xz) = 9c38cca66a59768f22737c5b4d88e201ddd9c381239b49556d44cf60d1175af5
 94SHA512 (rust-std-1.63.0-sparc64-unknown-netbsd.tar.xz) = ce6e74057ffa960cfd4a87a1f08d2eb2fe7cb15af233caf05fd0b19ff37ad464a82f6a32f8eb4cf9bdccb2ca62b0ff6d682c9bd986d7d05ebb65940b67ab46af
 95Size (rust-std-1.63.0-sparc64-unknown-netbsd.tar.xz) = 20674968 bytes
 96BLAKE2s (rust-std-1.63.0-x86_64-apple-darwin.tar.gz) = 165cd3cb5ade9ff694fdc60f4a327245ea75ca9794e90624bc5ecd7c7fd731e1
 97SHA512 (rust-std-1.63.0-x86_64-apple-darwin.tar.gz) = 2f62040a55e3a9d52a2bfabecacc2f0e36fd1dcdc00b3adc549acac85cb8c1ceeefc68222968eefb6f37d8114a154a91d02fd18ee95889cf80efc291cdc8df6d
 98Size (rust-std-1.63.0-x86_64-apple-darwin.tar.gz) = 40445814 bytes
 99BLAKE2s (rust-std-1.63.0-x86_64-unknown-freebsd.tar.gz) = 888fad5e8a5b4fd08e8d895cf2fb82d9a552df486716a6b28d98a77e41c1c977
 100SHA512 (rust-std-1.63.0-x86_64-unknown-freebsd.tar.gz) = 63c39aa71b0e8ef972bc6211f0c2ec7cf85e30a5ee161d37b8c3f4e2650eb6b843d9c7be46447cb0d4cdef44627b298257a4139c16b5e94636b39ea93d60ee77
 101Size (rust-std-1.63.0-x86_64-unknown-freebsd.tar.gz) = 42592740 bytes
 102BLAKE2s (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 6202c2a656b8f0069ca2acec86f11103479f35a8ce08d7a699cb55be954d7764
 103SHA512 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = d79f38ef9879ea9ec2841c3c64c49a3e4645d7225a6500fad38ef7161c147664905812f2f20dbd1d8f955ae629f15f74c09bff23d24f4d969b91e5bac1191852
 104Size (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 44064096 bytes
 105BLAKE2s (rust-std-1.63.0-x86_64-unknown-netbsd.tar.xz) = 5328a4215846005afcbc8a8118d9a4d927557a63814a3db3a7095a9999a90c15
 106SHA512 (rust-std-1.63.0-x86_64-unknown-netbsd.tar.xz) = b7b1fda019b7a161bd8ceb259c980f2ad26fac186d6deb7c5493b81652cbc04e5ca3036ca93ec64fcf9bee49df24b9c438532c7a4a221472ab1efa4f7cff6f58
 107Size (rust-std-1.63.0-x86_64-unknown-netbsd.tar.xz) = 25553764 bytes
 108BLAKE2s (rustc-1.64.0-src.tar.gz) = b390e0040c2cffa5b69eadba870e40667986d4d0b9c4952692d6e62b6cddc810
 109SHA512 (rustc-1.64.0-src.tar.gz) = 1c453702f6d6cbdb12633d3db617495d69f7b6c6645cbef72750470b6ca826dd410fde0bbacbf11621234c4e12fa72e27f61fc2858983ec4490a68ce025e4660
 110Size (rustc-1.64.0-src.tar.gz) = 205881934 bytes
 111SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = bfa0196fa53ac0fc95dc30a4a5097b8db805251e
 112SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
113SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4 113SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
114SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 71b5736952023931c94c6996e73cdcfc66b429fe 114SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 71b5736952023931c94c6996e73cdcfc66b429fe
115SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 46d434ec650c4e1ad419cf4c84a0c21d2ae5975a 115SHA1 (patch-compiler_rustc__target_src_spec_mipsel__unknown__netbsd.rs) = 41a6d29fca1419f8a89f9d0be0c190481c349d0e
 116SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 275120b9e07863a19c821064d9010c6fbb537044
116SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 57b26a7eb55a4a8e9ec8c4fb8b3b318a25d5a78b 117SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 57b26a7eb55a4a8e9ec8c4fb8b3b318a25d5a78b
117SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 32ab8ea3809cd4f6fee9fc0df5db47d76ccbd9d2 118SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 32ab8ea3809cd4f6fee9fc0df5db47d76ccbd9d2
118SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a851cf5dfbf343a9ff4e1be 119SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a851cf5dfbf343a9ff4e1be
119SHA1 (patch-library_std_src_sys_unix_mod.rs) = ef9e2b2e78602d5779e5d17e979347b0237ea4a6 120SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
120SHA1 (patch-library_std_src_sys_unix_thread.rs) = aafa957d5cfa0f48a6e43c20cfa346261ec7aa76 121SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e919325e99b
121SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8 122SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
122SHA1 (patch-src_bootstrap_bootstrap.py) = a8fe1932417520a3db8811a63ec3410ca46694d8 123SHA1 (patch-src_bootstrap_bootstrap.py) = fdb4e2e7fd61ae10f4f4b06ef895a8ebf47fbf7a
123SHA1 (patch-src_bootstrap_builder.rs) = ef84496eaeca753200e7a8fc7cf1c460ca3c464c 124SHA1 (patch-src_bootstrap_builder.rs) = b0ba2b3d611158ecf5ae2745d671e5fcdd2c4032
124SHA1 (patch-src_bootstrap_compile.rs) = 4dfce147e78968b67c5e32edbadf487cea21c613 125SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
125SHA1 (patch-src_bootstrap_lib.rs) = 5815a67cbb5b40f652dfe60d1b715e69bdeec1b5 126SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
126SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = fb1b9ea0c81bf96abb5a88fcb523631c42cd8f14 127SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
127SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = fef9f055d2b918c4480fbf8ee68e259197490a0f 128SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
128SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1 129SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
129SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 26982203916ad601599c7a3e05867e4dad742ae1 130SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 26982203916ad601599c7a3e05867e4dad742ae1
130SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15 131SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15
131SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 88c2f26c5980a3cfacd7a928044dff68eb0ec61e 132SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = dc9b405b41882bc7c74e08b8188acab3d4aed4ad
132SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906 133SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906
133SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = 8174664b7bce2e60e690bc20ab688606b60c55dc 134SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = 8174664b7bce2e60e690bc20ab688606b60c55dc
134SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 5236eda97fa686b5661e4e5832102e2f010def7b 135SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 5236eda97fa686b5661e4e5832102e2f010def7b
135SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546 136SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546
136SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153 137SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153
137SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80 138SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
138SHA1 (patch-vendor_cc-1.0.69_src_lib.rs) = b5c0f795624b928b8b02fe01174e6a24e770adea 139SHA1 (patch-vendor_cc-1.0.69_src_lib.rs) = b5c0f795624b928b8b02fe01174e6a24e770adea
139SHA1 (patch-vendor_cc_src_lib.rs) = 8864edc8dc0ad0665a89c89016bbaee7d603cbe1 140SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
140SHA1 (patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e447bd34d0dd7c6a51fbc27dfae50129d0b33462 141SHA1 (patch-vendor_crossbea_no__atomic.rs) = 6054fa9cb00b9cc7d9125354702945ac22ad6aeb
141SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 31b1f5d1c9d289ecbd219b8bb2fd3839db5e7862 142SHA1 (patch-vendor_crossbeam-epch-0.9.6_no__atomic.rs) = 96334fb4ceee3332b5f1c7750c93664485b01365
142SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 5b45640b2f0015142bd1eda5d5f02c7dbfe9210c 143SHA1 (patch-vendor_crossbeam-epoch-0.9.8_no__atomic.rs) = fce16287a86bfa54f4b138f0c4a6c477f2d2e217
 144SHA1 (patch-vendor_crossbeam-epoch_no__atomic.rs) = ee6294d0cef62e843aa7d4e693cc72b1347ff6e1
 145SHA1 (patch-vendor_crossbeam-queue_no__atomic.rs) = aaa732788e97803eb7e219614f5e7ff1d9dc1d0f
 146SHA1 (patch-vendor_crossbeam-utils-0.8.0_no__atomic.rs) = 7f31d6c45ef843eb2595df58e46b0e44dded0cc9
 147SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = 4ada02a26490ca6fcd87af999bbb8cef48078060
 148SHA1 (patch-vendor_kqueue_src_time.rs) = 21950e7d79fb88257bdb11b988f2a3ae0084ba3d
 149SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 09326b70d7821b1742285c464c70b347400191d7
 150SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = cd974123dbefc1149abce884f91d9727e82bb8b6
 151SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
143SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437 152SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
144SHA1 (patch-vendor_openssl-src_src_lib.rs) = 6995ddbf7d17bcd1cb6733a73c29ccdae4f2ab97 153SHA1 (patch-vendor_openssl-src_src_lib.rs) = 393b5dd0b5bd32c41cd60fec787ffb8a2dc3cd20
145SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7 154SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
146SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e 155SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
147SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 421aa776a05a64674ffa447b85cfe463075160a2 156SHA1 (patch-vendor_target-lexicon_src_targets.rs) = e0c67288516ff8d379d6d1e7b05d4ab86f9ac0a7
 157SHA1 (patch-vendor_valuable_no__atomic.rs) = 4c3415e08569c6330f238ff47b25ef229ab7b68f

cvs diff -r1.4 -r1.5 pkgsrc/lang/rust/do-cross.mk (expand / switch to unified diff)

--- pkgsrc/lang/rust/do-cross.mk 2022/10/23 14:48:31 1.4
+++ pkgsrc/lang/rust/do-cross.mk 2022/11/15 23:11:14 1.5
@@ -1,103 +1,107 @@ @@ -1,103 +1,107 @@
1# $NetBSD: do-cross.mk,v 1.4 2022/10/23 14:48:31 he Exp $ 1# $NetBSD: do-cross.mk,v 1.5 2022/11/15 23:11:14 he Exp $
2# Do all the NetBSD cross builds 2# Do all the NetBSD cross builds
3# Collect the bootstrap kits in dist/ 3# Collect the bootstrap kits in dist/
4 4
5VERSION!= make show-var VARNAME=PKGVERSION 5VERSION!= make show-var VARNAME=PKGVERSION
6V_NOREV!= make show-var VARNAME=PKGVERSION_NOREV 6V_NOREV!= make show-var VARNAME=PKGVERSION_NOREV
7 7
8SHORT_TARGETS+= armv7 8SHORT_TARGETS+= armv7
9SHORT_TARGETS+= armv6 9SHORT_TARGETS+= armv6
10SHORT_TARGETS+= sparc64 10SHORT_TARGETS+= sparc64
11SHORT_TARGETS+= powerpc 11SHORT_TARGETS+= powerpc
12SHORT_TARGETS+= powerpc90 12SHORT_TARGETS+= powerpc90
13SHORT_TARGETS+= arm64 13SHORT_TARGETS+= arm64
14SHORT_TARGETS+= arm64_be 14SHORT_TARGETS+= arm64_be
15SHORT_TARGETS+= i386 15SHORT_TARGETS+= i386
 16#SHORT_TARGETS+= mipsel
16 17
17# Conditional local overrides of ROOT.* variables: 18# Conditional local overrides of ROOT.* variables:
18.sinclude "local-roots.mk" 19.sinclude "local-roots.mk"
19 20
20# Root of target directories. 21# Root of target directories.
21# Must have dest/ (build.sh's DESTDIR) and tools/ subdirectories 22# Must have dest/ (build.sh's DESTDIR) and tools/ subdirectories
22ROOT.armv7?= /u/evbarm-armv7hf 23ROOT.armv7?= /u/evbarm-armv7hf
23ROOT.armv6?= /u/evbarm-armv6hf 24ROOT.armv6?= /u/evbarm-armv6hf
24ROOT.sparc64?= /u/sparc64 25ROOT.sparc64?= /u/sparc64
25ROOT.powerpc?= /u/macppc 26ROOT.powerpc?= /u/macppc
26ROOT.powerpc90?= /u/9.0-macppc 27ROOT.powerpc90?= /u/9.0-macppc
27ROOT.arm64?= /u/evbarm64 28ROOT.arm64?= /u/evbarm64
28ROOT.arm64_be?= /u/evbarm64eb 29ROOT.arm64_be?= /u/evbarm64eb
29ROOT.i386?= /u/i386 30ROOT.i386?= /u/i386
 31ROOT.mipsel?= /u/mipsel
30 32
31# Mapping to GNU triple 33# Mapping to GNU triple
32G_TGT.armv7= armv7--netbsdelf-eabihf 34G_TGT.armv7= armv7--netbsdelf-eabihf
33G_TGT.armv6= armv6--netbsdelf-eabihf 35G_TGT.armv6= armv6--netbsdelf-eabihf
34G_TGT.sparc64= sparc64--netbsd 36G_TGT.sparc64= sparc64--netbsd
35G_TGT.powerpc= powerpc--netbsd 37G_TGT.powerpc= powerpc--netbsd
36G_TGT.powerpc90= powerpc--netbsd 38G_TGT.powerpc90= powerpc--netbsd
37G_TGT.arm64= aarch64--netbsd 39G_TGT.arm64= aarch64--netbsd
38G_TGT.arm64_be= aarch64_be--netbsd 40G_TGT.arm64_be= aarch64_be--netbsd
39G_TGT.i386= i486--netbsdelf 41G_TGT.i386= i486--netbsdelf
 42G_TGT.mipsel= mipsel--netbsd
40 43
41# Mapping to rust's TARGET specification 44# Mapping to rust's TARGET specification
42TGT.armv7= armv7-unknown-netbsd-eabihf 45TGT.armv7= armv7-unknown-netbsd-eabihf
43TGT.armv6= armv6-unknown-netbsd-eabihf 46TGT.armv6= armv6-unknown-netbsd-eabihf
44TGT.sparc64= sparc64-unknown-netbsd 47TGT.sparc64= sparc64-unknown-netbsd
45TGT.powerpc= powerpc-unknown-netbsd 48TGT.powerpc= powerpc-unknown-netbsd
46TGT.powerpc90= powerpc-unknown-netbsd 49TGT.powerpc90= powerpc-unknown-netbsd
47TGT.arm64= aarch64-unknown-netbsd 50TGT.arm64= aarch64-unknown-netbsd
48TGT.arm64_be= aarch64_be-unknown-netbsd 51TGT.arm64_be= aarch64_be-unknown-netbsd
49TGT.i386= i586-unknown-netbsd 52TGT.i386= i586-unknown-netbsd
 53TGT.mipsel= mipsel-unknown-netbsd
50 54
51# Optional target tweak for bootstrap files 55# Optional target tweak for bootstrap files
52TT.powerpc90= powerpc-unknown-netbsd90 56TT.powerpc90= powerpc-unknown-netbsd90
53 57
54WRKDIR= ${.CURDIR}/work 58WRKDIR= ${.CURDIR}/work
55SCRIPTS= ${WRKDIR}/scripts 59SCRIPTS= ${WRKDIR}/scripts
56 60
57#DEBUG= echo 61#DEBUG= echo
58 62
59# Make list of make targets 63# Make list of make targets
60.for st in ${SHORT_TARGETS} 64.for st in ${SHORT_TARGETS}
61MTGTS+= do-${st} 65MTGTS+= do-${st}
62.endfor 66.endfor
63 67
64all: ${MTGTS} 68all: ${MTGTS}
65 69
66# Define the individual build targets, used above 70# Define the individual build targets, used above
67.for st in ${SHORT_TARGETS} 71.for st in ${SHORT_TARGETS}
68CA.${st}=--host=${TGT.${st}} 72CA.${st}=--host=${TGT.${st}}
69CA.${st}+=--target=${TGT.${st}} 73CA.${st}+=--target=${TGT.${st}}
70CA.${st}+=--set=target.${TGT.${st}}.cc=${SCRIPTS}/gcc-wrap 74CA.${st}+=--set=target.${TGT.${st}}.cc=${SCRIPTS}/gcc-wrap
71CA.${st}+=--set=target.${TGT.${st}}.cxx=${SCRIPTS}/c++-wrap 75CA.${st}+=--set=target.${TGT.${st}}.cxx=${SCRIPTS}/c++-wrap
72CA.${st}+=--set=target.${TGT.${st}}.linker=${SCRIPTS}/gcc-wrap 76CA.${st}+=--set=target.${TGT.${st}}.linker=${SCRIPTS}/gcc-wrap
73CA.${st}+=--set=target.${TGT.${st}}.ar=${ROOT.${st}}/tools/bin/${G_TGT.${st}}-ar 77CA.${st}+=--set=target.${TGT.${st}}.ar=${ROOT.${st}}/tools/bin/${G_TGT.${st}}-ar
74do-${st}: 78do-${st}:
75 mkdir -p dist 79 mkdir -p dist
76 ${ECHO} "=======> Cross-building rust for ${st}" 80 @echo "=======> Cross-building rust for ${st}"
77 ${DEBUG} make -f Makefile clean 81 ${DEBUG} make -f Makefile clean
78 ${DEBUG} env \ 82 ${DEBUG} env \
79 CROSS_ROOT=${ROOT.${st}} \ 83 CROSS_ROOT=${ROOT.${st}} \
80 GNU_CROSS_TARGET=${G_TGT.${st}} \ 84 GNU_CROSS_TARGET=${G_TGT.${st}} \
81 make -f Makefile \ 85 make -f Makefile \
82 ADD_CONFIGURE_ARGS="${CA.${st}}" \ 86 ADD_CONFIGURE_ARGS="${CA.${st}}" \
83 TARGET=${TGT.${st}} 87 TARGET=${TGT.${st}}
84 if [ "${TT.${st}}" != "" ]; then \ 88 if [ "${TT.${st}}" != "" ]; then \
85 TT=${TT.${st}}; \ 89 TT=${TT.${st}}; \
86 else \ 90 else \
87 TT=${TGT.${st}}; \ 91 TT=${TGT.${st}}; \
88 fi; \ 92 fi; \
89 distdir=${WRKDIR}/rustc-${V_NOREV}-src/build/dist; \ 93 distdir=${WRKDIR}/rustc-${V_NOREV}-src/build/dist; \
90 for comp in rust rust-std; do \ 94 for comp in rust rust-std; do \
91 src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \ 95 src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
92 tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \ 96 tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
93 if [ ! -f "$${tgt}" ]; then \ 97 if [ ! -f "$${tgt}" ]; then \
94 ${ECHO} ln $${src} $${tgt}; \ 98 echo ln $${src} $${tgt}; \
95 ${DEBUG} ln $${src} $${tgt}; \ 99 ${DEBUG} ln $${src} $${tgt}; \
96 fi; \ 100 fi; \
97 done; \ 101 done; \
98 src_comp=rust-src-${V_NOREV}.tar.xz; \ 102 src_comp=rust-src-${V_NOREV}.tar.xz; \
99 if [ ! -f dist/$${src_comp} ]; then \ 103 if [ ! -f dist/$${src_comp} ]; then \
100 ${ECHO} ln $${distdir}/$${src_comp} dist; \ 104 echo ln $${distdir}/$${src_comp} dist; \
101 ${DEBUG} ln $${distdir}/$${src_comp} dist; \ 105 ${DEBUG} ln $${distdir}/$${src_comp} dist; \
102 fi 106 fi
103.endfor 107.endfor

cvs diff -r1.29 -r1.30 pkgsrc/lang/rust/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/rust/options.mk 2022/11/15 15:42:29 1.29
+++ pkgsrc/lang/rust/options.mk 2022/11/15 23:11:14 1.30
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: options.mk,v 1.29 2022/11/15 15:42:29 wiz Exp $ 1# $NetBSD: options.mk,v 1.30 2022/11/15 23:11:14 he Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.rust 3PKG_OPTIONS_VAR= PKG_OPTIONS.rust
4PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs 4PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8# The bundled LLVM current has issues building on SunOS. 8# The bundled LLVM current has issues building on SunOS.
9.if ${OPSYS} != "SunOS" 9.if ${OPSYS} != "SunOS"
10PKG_SUPPORTED_OPTIONS+= rust-internal-llvm 10PKG_SUPPORTED_OPTIONS+= rust-internal-llvm
11# There may be compatibility issues with the base LLVM on e.g. NetBSD. 11# There may be compatibility issues with the base LLVM on e.g. NetBSD.
12. if !empty(HAVE_LLVM) || !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) 12. if !empty(HAVE_LLVM) || !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
13PKG_SUGGESTED_OPTIONS+= rust-internal-llvm 13PKG_SUGGESTED_OPTIONS+= rust-internal-llvm
14. endif 14. endif
15.endif 15.endif
16 16
17# If cross-building, always use the internal LLVM 17# If cross-building, always use the internal LLVM
18.if !empty(TARGET) 18.if !empty(TARGET)
19PKG_SUGGESTED_OPTIONS+= rust-internal-llvm 19PKG_SUGGESTED_OPTIONS+= rust-internal-llvm
20.endif 20.endif
21 21
22# as llvm 15 does not work with rust 1.63, always use internal llvm for now 
23PKG_SUGGESTED_OPTIONS+= rust-internal-llvm 
24 
25# Bundle OpenSSL and curl into the cargo binary when producing 22# Bundle OpenSSL and curl into the cargo binary when producing
26# bootstraps on NetBSD. 23# bootstraps on NetBSD.
27.if ${OPSYS} == "NetBSD" && ${BUILD_TARGET} == "dist" 24.if ${OPSYS} == "NetBSD" && ${BUILD_TARGET} == "dist"
28PKG_SUGGESTED_OPTIONS+= rust-cargo-static 25PKG_SUGGESTED_OPTIONS+= rust-cargo-static
29.endif 26.endif
30 27
31PKG_OPTIONS_LEGACY_OPTS+= rust-llvm:rust-internal-llvm 28PKG_OPTIONS_LEGACY_OPTS+= rust-llvm:rust-internal-llvm
32 29
33.include "../../mk/bsd.options.mk" 30.include "../../mk/bsd.options.mk"
34 31
35# 32#
36# Use the internal copy of LLVM or the external one? 33# Use the internal copy of LLVM or the external one?
37# 34#

cvs diff -r1.8 -r1.9 pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs 2022/10/10 20:34:15 1.8
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs 2022/11/15 23:11:14 1.9
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.8 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.9 2022/11/15 23:11:14 he Exp $
2 2
3Do not use @rpath on Darwin. 3Do not use @rpath on Darwin.
4 4
5--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2021-09-06 18:42:35.000000000 +0000 5--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2021-09-06 18:42:35.000000000 +0000
6+++ compiler/rustc_codegen_ssa/src/back/linker.rs 6+++ compiler/rustc_codegen_ssa/src/back/linker.rs
7@@ -326,7 +326,7 @@ impl<'a> GccLinker<'a> { 7@@ -326,7 +326,7 @@ impl<'a> GccLinker<'a> {
8 // principled solution at some point to force the compiler to pass 8 // principled solution at some point to force the compiler to pass
9 // the right `-Wl,-install_name` with an `@rpath` in it. 9 // the right `-Wl,-install_name` with an `@rpath` in it.
10 if self.sess.opts.cg.rpath || self.sess.opts.debugging_opts.osx_rpath_install_name { 10 if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name {
11- let mut rpath = OsString::from("@rpath/"); 11- let mut rpath = OsString::from("@rpath/");
12+ let mut rpath = OsString::from("@PREFIX@/lib/"); 12+ let mut rpath = OsString::from("@PREFIX@/lib/");
13 rpath.push(out_filename.file_name().unwrap()); 13 rpath.push(out_filename.file_name().unwrap());
14 self.linker_args(&[OsString::from("-install_name"), rpath]); 14 self.linker_args(&[OsString::from("-install_name"), rpath]);
15 } 15 }

cvs diff -r1.8 -r1.9 pkgsrc/lang/rust/patches/patch-compiler_rustc__llvm_build.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-compiler_rustc__llvm_build.rs 2022/08/30 19:22:17 1.8
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__llvm_build.rs 2022/11/15 23:11:14 1.9
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.8 2022/08/30 19:22:17 he Exp $ 1$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.9 2022/11/15 23:11:14 he Exp $
2 2
3Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this. 3Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
4 4
5--- compiler/rustc_llvm/build.rs.orig 2021-11-01 07:17:29.000000000 +0000 5--- compiler/rustc_llvm/build.rs.orig 2021-11-01 07:17:29.000000000 +0000
6+++ compiler/rustc_llvm/build.rs 6+++ compiler/rustc_llvm/build.rs
7@@ -331,7 +331,13 @@ fn main() { 7@@ -268,7 +268,13 @@ fn main() {
8 "c++" 8 "c++"
9 } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() { 9 } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
10 // NetBSD uses a separate library when relocation is required 10 // NetBSD uses a separate library when relocation is required
11- "stdc++_pic" 11- "stdc++_pic"
12+ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { 12+ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
13+ "c++_pic" 13+ "c++_pic"
14+ } else { 14+ } else {
15+ "stdc++_pic" 15+ "stdc++_pic"
16+ } 16+ }
17+ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { 17+ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
18+ "c++" 18+ "c++"
19 } else if llvm_use_libcxx.is_some() { 19 } else if llvm_use_libcxx.is_some() {
20 "c++" 20 "c++"

cvs diff -r1.8 -r1.9 pkgsrc/lang/rust/patches/Attic/patch-library_unwind_build.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/Attic/patch-library_unwind_build.rs 2022/05/25 21:31:26 1.8
+++ pkgsrc/lang/rust/patches/Attic/patch-library_unwind_build.rs 2022/11/15 23:11:14 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-library_unwind_build.rs,v 1.8 2022/05/25 21:31:26 he Exp $ 1$NetBSD: patch-library_unwind_build.rs,v 1.9 2022/11/15 23:11:14 he Exp $
2 2
3Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this. 3Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
4 4
5--- library/unwind/build.rs.orig 2020-10-07 07:53:22.000000000 +0000 5--- library/unwind/build.rs.orig 2020-10-07 07:53:22.000000000 +0000
6+++ library/unwind/build.rs 6+++ library/unwind/build.rs
7@@ -23,7 +23,9 @@ fn main() { 7@@ -20,7 +20,9 @@ fn main() {
8 } else if target.contains("freebsd") { 8 } else if target.contains("freebsd") {
9 println!("cargo:rustc-link-lib=gcc_s"); 9 println!("cargo:rustc-link-lib=gcc_s");
10 } else if target.contains("netbsd") { 10 } else if target.contains("netbsd") {
11- println!("cargo:rustc-link-lib=gcc_s"); 11- println!("cargo:rustc-link-lib=gcc_s");
12+ if !env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { 12+ if !env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
13+ println!("cargo:rustc-link-lib=gcc_s"); 13+ println!("cargo:rustc-link-lib=gcc_s");
14+ } 14+ }
15 } else if target.contains("openbsd") { 15 } else if target.contains("openbsd") {
16 if target.contains("sparc64") { 16 if target.contains("sparc64") {
17 println!("cargo:rustc-link-lib=gcc"); 17 println!("cargo:rustc-link-lib=gcc");

File Added: pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mipsel__unknown__netbsd.rs
$NetBSD: patch-compiler_rustc__target_src_spec_mipsel__unknown__netbsd.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add target spec for NetBSD/mipsel.

--- compiler/rustc_target/src/spec/mipsel_unknown_netbsd.rs.orig	2022-11-06 18:16:59.750850353 +0000
+++ compiler/rustc_target/src/spec/mipsel_unknown_netbsd.rs	2022-11-06 18:14:10.846209169 +0000
@@ -0,0 +1,19 @@
+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(32);
+
+    Target {
+	llvm_target: "mipsel-unknown-netbsd".into(),
+	pointer_width: 32,
+	data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
+	arch: "mips".into(),
+	options: TargetOptions {
+	    mcount: "__mcount".into(),
+	    endian: Endian::Little,
+	    ..base
+	},
+    }
+}

File Added: pkgsrc/lang/rust/patches/Attic/patch-vendor_crossbea_no__atomic.rs
$NetBSD: patch-vendor_crossbea_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have
native 64-bit atomic ops.

--- vendor/crossbeam/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam/no_atomic.rs
@@ -28,6 +28,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "powerpc-unknown-linux-gnu",

File Added: pkgsrc/lang/rust/patches/Attic/patch-vendor_crossbeam-epch-0.9.6_no__atomic.rs
$NetBSD: patch-vendor_crossbeam-epch-0.9.6_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have 
native 64-bit atomic ops.

--- vendor/crossbeam-epoch-0.9.6/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam-epoch-0.9.6/no_atomic.rs
@@ -31,6 +31,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "powerpc-unknown-freebsd",

File Added: pkgsrc/lang/rust/patches/Attic/patch-vendor_crossbeam-epoch-0.9.8_no__atomic.rs
$NetBSD: patch-vendor_crossbeam-epoch-0.9.8_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have 
native 64-bit atomic ops.

--- vendor/crossbeam-epoch-0.9.8/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam-epoch-0.9.8/no_atomic.rs
@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "msp430-none-elf",

File Added: pkgsrc/lang/rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
$NetBSD: patch-vendor_crossbeam-epoch_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have 
native 64-bit atomic ops.

--- vendor/crossbeam-epoch/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam-epoch/no_atomic.rs
@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "msp430-none-elf",

File Added: pkgsrc/lang/rust/patches/Attic/patch-vendor_crossbeam-queue_no__atomic.rs
$NetBSD: patch-vendor_crossbeam-queue_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have 
native 64-bit atomic ops.

--- vendor/crossbeam-queue/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam-queue/no_atomic.rs
@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "msp430-none-elf",

File Added: pkgsrc/lang/rust/patches/Attic/patch-vendor_crossbeam-utils-0.8.0_no__atomic.rs
$NetBSD: patch-vendor_crossbeam-utils-0.8.0_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have 
native 64-bit atomic ops.

--- vendor/crossbeam-utils-0.8.8/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam-utils-0.8.8/no_atomic.rs
@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "msp430-none-elf",

File Added: pkgsrc/lang/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
$NetBSD: patch-vendor_crossbeam-utils_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add "mipsel-unknown-netbsd" to the list who don't have 
native 64-bit atomic ops.

--- vendor/crossbeam-utils/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
+++ vendor/crossbeam-utils/no_atomic.rs
@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "msp430-none-elf",

File Added: pkgsrc/lang/rust/patches/Attic/patch-vendor_kqueue_src_time.rs
$NetBSD: patch-vendor_kqueue_src_time.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Use the timespec component types instead of hardcoding int lengths.
...except Linux has a quirk.

--- vendor/kqueue/src/time.rs.orig	2022-09-19 15:35:02.000000000 +0000
+++ vendor/kqueue/src/time.rs
@@ -1,32 +1,15 @@
-use libc::timespec;
+use libc::{timespec, time_t, c_long};
 use std::time::Duration;
 
-#[cfg(not(all(
-    any(target_os = "freebsd", target_os = "macos"),
-    any(target_arch = "x86", target_arch = "powerpc")
-)))]
-pub(crate) fn duration_to_timespec(d: Duration) -> timespec {
-    let tv_sec = d.as_secs() as i64;
-    let tv_nsec = d.subsec_nanos() as i64;
-
-    if tv_sec.is_negative() {
-        panic!("Duration seconds is negative");
-    }
-
-    if tv_nsec.is_negative() {
-        panic!("Duration nsecs is negative");
-    }
-
-    timespec { tv_sec, tv_nsec }
-}
+// Linux x32 compatibility, ref. libc/src/unix/mod.rs
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
+type NSec = i64;
+#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
+type NSec = c_long;
 
-#[cfg(all(
-    any(target_os = "freebsd", target_os = "macos"),
-    any(target_arch = "x86", target_arch = "powerpc")
-))]
 pub(crate) fn duration_to_timespec(d: Duration) -> timespec {
-    let tv_sec = d.as_secs() as i32;
-    let tv_nsec = d.subsec_nanos() as i32;
+    let tv_sec = d.as_secs() as time_t;
+    let tv_nsec = d.subsec_nanos() as NSec;
 
     if tv_sec.is_negative() {
         panic!("Duration seconds is negative");

File Added: pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mips.rs
# $NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mips.rs,v 1.1 2022/11/15 23:11:14 he Exp $

Add mips support.

--- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig	2022-11-06 22:14:03.866753983 +0000
+++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mips.rs	2022-11-06 22:07:15.448812020 +0000
@@ -0,0 +1,22 @@
+use PT_FIRSTMACH;
+
+pub type c_long = i32;
+pub type c_ulong = u32;
+pub type c_char = i8;
+pub type __cpu_simple_lock_nv_t = ::c_int;
+
+// should be pub(crate), but that requires Rust 1.18.0
+cfg_if! {
+    if #[cfg(libc_const_size_of)] {
+        #[doc(hidden)]
+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
+    } else {
+        #[doc(hidden)]
+        pub const _ALIGNBYTES: usize = 8 - 1;
+    }
+}
+
+pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
+pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
+pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 3;
+pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 4;

File Added: pkgsrc/lang/rust/patches/patch-vendor_valuable_no__atomic.rs
$NetBSD: patch-vendor_valuable_no__atomic.rs,v 1.1 2022/11/15 23:11:14 he Exp $

--- vendor/valuable/no_atomic.rs.orig	2022-09-19 15:35:03.000000000 +0000
+++ vendor/valuable/no_atomic.rs
@@ -30,6 +30,7 @@ const NO_ATOMIC_64: &[&str] = &[
     "mipsel-unknown-linux-musl",
     "mipsel-unknown-linux-uclibc",
     "mipsel-unknown-none",
+    "mipsel-unknown-netbsd",
     "mipsisa32r6-unknown-linux-gnu",
     "mipsisa32r6el-unknown-linux-gnu",
     "powerpc-unknown-freebsd",

cvs diff -r1.10 -r1.11 pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs 2022/10/10 20:34:15 1.10
+++ pkgsrc/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs 2022/11/15 23:11:14 1.11
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.10 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.11 2022/11/15 23:11:14 he Exp $
2 2
3Add i586(pentium) and aarch64_be targets. 3Add i586(pentium), aarch64_be and mips NetBSD targets.
4 4
5--- compiler/rustc_target/src/spec/mod.rs.orig 2021-03-23 16:15:10.000000000 +0000 5--- compiler/rustc_target/src/spec/mod.rs.orig 2021-03-23 16:15:10.000000000 +0000
6+++ compiler/rustc_target/src/spec/mod.rs 6+++ compiler/rustc_target/src/spec/mod.rs
7@@ -895,9 +895,11 @@ supported_targets! { 7@@ -898,9 +898,12 @@ supported_targets! {
8 ("powerpc-unknown-openbsd", powerpc_unknown_openbsd), 8 ("powerpc-unknown-openbsd", powerpc_unknown_openbsd),
9  9
10 ("aarch64-unknown-netbsd", aarch64_unknown_netbsd), 10 ("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
11+ ("aarch64_be-unknown-netbsd", aarch64_be_unknown_netbsd), 11+ ("aarch64_be-unknown-netbsd", aarch64_be_unknown_netbsd),
12 ("armv6-unknown-netbsd-eabihf", armv6_unknown_netbsd_eabihf), 12 ("armv6-unknown-netbsd-eabihf", armv6_unknown_netbsd_eabihf),
13 ("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf), 13 ("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
14 ("i686-unknown-netbsd", i686_unknown_netbsd), 14 ("i686-unknown-netbsd", i686_unknown_netbsd),
15+ ("i586-unknown-netbsd", i586_unknown_netbsd), 15+ ("i586-unknown-netbsd", i586_unknown_netbsd),
 16+ ("mipsel-unknown-netbsd", mipsel_unknown_netbsd),
16 ("powerpc-unknown-netbsd", powerpc_unknown_netbsd), 17 ("powerpc-unknown-netbsd", powerpc_unknown_netbsd),
17 ("sparc64-unknown-netbsd", sparc64_unknown_netbsd), 18 ("sparc64-unknown-netbsd", sparc64_unknown_netbsd),
18 ("x86_64-unknown-netbsd", x86_64_unknown_netbsd), 19 ("x86_64-unknown-netbsd", x86_64_unknown_netbsd),

cvs diff -r1.10 -r1.11 pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake 2022/05/25 21:31:26 1.10
+++ pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake 2022/11/15 23:11:14 1.11
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.10 2022/05/25 21:31:26 he Exp $ 1$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.11 2022/11/15 23:11:14 he Exp $
2 2
3On Darwin, use correct install-name for shared libraries. 3On Darwin, use correct install-name for shared libraries.
4 4
5--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig 2020-09-22 17:14:20.000000000 +0000 5--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig 2020-09-22 17:14:20.000000000 +0000
6+++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake 6+++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
7@@ -2143,7 +2143,7 @@ function(llvm_setup_rpath name) 7@@ -2117,7 +2117,7 @@ function(llvm_setup_rpath name)
8 endif() 8 endif()
9  9
10 if (APPLE) 10 if (APPLE)
11- set(_install_name_dir INSTALL_NAME_DIR "@rpath") 11- set(_install_name_dir INSTALL_NAME_DIR "@rpath")
12+ set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") 12+ set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
13 set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) 13 set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
14 elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) 14 elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
15 # $ORIGIN is not interpreted at link time by aix ld. 15 # $ORIGIN is not interpreted at link time by aix ld.

cvs diff -r1.5 -r1.6 pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs 2022/10/10 20:34:15 1.5
+++ pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs 2022/11/15 23:11:14 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-library_std_src_sys_unix_mod.rs,v 1.5 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-library_std_src_sys_unix_mod.rs,v 1.6 2022/11/15 23:11:14 he Exp $
2 2
3Add libexecinfo for backtrace() on NetBSD. 3Add libexecinfo for backtrace() on NetBSD.
4 4
5--- library/std/src/sys/unix/mod.rs.orig 2021-02-10 17:36:44.000000000 +0000 5--- library/std/src/sys/unix/mod.rs.orig 2021-02-10 17:36:44.000000000 +0000
6+++ library/std/src/sys/unix/mod.rs 6+++ library/std/src/sys/unix/mod.rs
7@@ -302,6 +302,7 @@ cfg_if::cfg_if! { 7@@ -269,6 +269,7 @@ cfg_if::cfg_if! {
8 #[link(name = "pthread")] 8 #[link(name = "pthread")]
9 extern "C" {} 9 extern "C" {}
10 } else if #[cfg(target_os = "netbsd")] { 10 } else if #[cfg(target_os = "netbsd")] {
11+ #[link(name = "execinfo")] 11+ #[link(name = "execinfo")]
12 #[link(name = "pthread")] 12 #[link(name = "pthread")]
13 #[link(name = "rt")] 13 #[link(name = "rt")]
14 extern "C" {} 14 extern "C" {}

cvs diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs 2022/08/30 19:22:17 1.9
+++ pkgsrc/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs 2022/11/15 23:11:14 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.9 2022/08/30 19:22:17 he Exp $ 1$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.10 2022/11/15 23:11:14 he Exp $
2 2
3Fix stack-clash on SunOS. 3Fix stack-clash on SunOS.
4 4
5--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000 5--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000
6+++ library/std/src/sys/unix/thread.rs 6+++ library/std/src/sys/unix/thread.rs
7@@ -584,7 +584,7 @@ pub mod guard { 7@@ -470,7 +470,7 @@ pub mod guard {
8 let page_size = os::page_size(); 8 let page_size = os::page_size();
9 PAGE_SIZE.store(page_size, Ordering::Relaxed); 9 PAGE_SIZE.store(page_size, Ordering::Relaxed);
10  10
11- if cfg!(all(target_os = "linux", not(target_env = "musl"))) { 11- if cfg!(all(target_os = "linux", not(target_env = "musl"))) {
12+ if cfg!(any(target_os = "solaris", all(target_os = "linux", not(target_env = "musl")))) { 12+ if cfg!(any(target_os = "solaris", all(target_os = "linux", not(target_env = "musl")))) {
13 // Linux doesn't allocate the whole stack right away, and 13 // Linux doesn't allocate the whole stack right away, and
14 // the kernel has its own stack-guard mechanism to fault 14 // the kernel has its own stack-guard mechanism to fault
15 // when growing too close to an existing mapping. If we map 15 // when growing too close to an existing mapping. If we map

cvs diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-src_bootstrap_compile.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_bootstrap_compile.rs 2022/10/10 20:34:15 1.9
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_compile.rs 2022/11/15 23:11:14 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_bootstrap_compile.rs,v 1.9 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-src_bootstrap_compile.rs,v 1.10 2022/11/15 23:11:14 he Exp $
2 2
3On Darwin, do not use @rpath for internal libraries. 3On Darwin, do not use @rpath for internal libraries.
4 4
5--- src/bootstrap/compile.rs.orig 2021-09-06 18:42:35.000000000 +0000 5--- src/bootstrap/compile.rs.orig 2021-09-06 18:42:35.000000000 +0000
6+++ src/bootstrap/compile.rs 6+++ src/bootstrap/compile.rs
7@@ -418,7 +418,7 @@ fn copy_sanitizers( 7@@ -414,7 +414,7 @@ fn copy_sanitizers(
8  8
9 if target == "x86_64-apple-darwin" || target == "aarch64-apple-darwin" { 9 if target == "x86_64-apple-darwin" || target == "aarch64-apple-darwin" {
10 // Update the library’s install name to reflect that it has has been renamed. 10 // Update the library’s install name to reflect that it has has been renamed.
11- apple_darwin_update_library_name(&dst, &format!("@rpath/{}", &runtime.name)); 11- apple_darwin_update_library_name(&dst, &format!("@rpath/{}", &runtime.name));
12+ apple_darwin_update_library_name(&dst, &format!("@PREFIX@/lib/{}", &runtime.name)); 12+ apple_darwin_update_library_name(&dst, &format!("@PREFIX@/lib/{}", &runtime.name));
13 // Upon renaming the install name, the code signature of the file will invalidate, 13 // Upon renaming the install name, the code signature of the file will invalidate,
14 // so we will sign it again. 14 // so we will sign it again.
15 apple_darwin_sign_file(&dst); 15 apple_darwin_sign_file(&dst);

cvs diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt 2022/05/25 21:31:26 1.9
+++ pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt 2022/11/15 23:11:14 1.10
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.9 2022/05/25 21:31:26 he Exp $ 1$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.10 2022/11/15 23:11:14 he Exp $
2 2
3Don't implement sys/regset.h workaround, fix source instead. 3Don't implement sys/regset.h workaround, fix source instead.
4 4
5--- src/llvm-project/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000 5--- src/llvm-project/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000
6+++ src/llvm-project/llvm/CMakeLists.txt 6+++ src/llvm-project/llvm/CMakeLists.txt
7@@ -1025,11 +1025,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST) 7@@ -939,11 +939,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
8 # (this is a variable that CrossCompile sets on recursive invocations) 8 # (this is a variable that CrossCompile sets on recursive invocations)
9 endif() 9 endif()
10  10
11-if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS ) 11-if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
12- # special hack for Solaris to handle crazy system sys/regset.h 12- # special hack for Solaris to handle crazy system sys/regset.h
13- include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris") 13- include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
14-endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS ) 14-endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
15- 15-
16 # Make sure we don't get -rdynamic in every binary. For those that need it, 16 # Make sure we don't get -rdynamic in every binary. For those that need it,
17 # use export_executable_symbols(target). 17 # use export_executable_symbols(target).
18 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") 18 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")

cvs diff -r1.9 -r1.10 pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs 2022/08/30 19:22:17 1.9
+++ pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs 2022/11/15 23:11:14 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.9 2022/08/30 19:22:17 he Exp $ 1$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.10 2022/11/15 23:11:14 he Exp $
2 2
3Fix xattr build. 3Fix xattr build.
4 4
5--- vendor/libc/src/unix/solarish/mod.rs.orig 2019-05-20 13:47:24.000000000 +0000 5--- vendor/libc/src/unix/solarish/mod.rs.orig 2019-05-20 13:47:24.000000000 +0000
6+++ vendor/libc/src/unix/solarish/mod.rs 6+++ vendor/libc/src/unix/solarish/mod.rs
7@@ -1516,6 +1516,8 @@ pub const EOWNERDEAD: ::c_int = 58; 7@@ -1215,6 +1215,8 @@ pub const EOWNERDEAD: ::c_int = 58;
8 pub const ENOTRECOVERABLE: ::c_int = 59; 8 pub const ENOTRECOVERABLE: ::c_int = 59;
9 pub const ENOSTR: ::c_int = 60; 9 pub const ENOSTR: ::c_int = 60;
10 pub const ENODATA: ::c_int = 61; 10 pub const ENODATA: ::c_int = 61;
11+// This is not supported but is required for xattr 11+// This is not supported but is required for xattr
12+pub const ENOATTR: ::c_int = ::ENODATA; 12+pub const ENOATTR: ::c_int = ::ENODATA;
13 pub const ETIME: ::c_int = 62; 13 pub const ETIME: ::c_int = 62;
14 pub const ENOSR: ::c_int = 63; 14 pub const ENOSR: ::c_int = 63;
15 pub const ENONET: ::c_int = 64; 15 pub const ENONET: ::c_int = 64;

cvs diff -r1.15 -r1.16 pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py 2022/10/26 12:51:46 1.15
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py 2022/11/15 23:11:14 1.16
@@ -1,55 +1,55 @@ @@ -1,55 +1,55 @@
1$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.15 2022/10/26 12:51:46 he Exp $ 1$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.16 2022/11/15 23:11:14 he Exp $
2 2
3Use `uname -p` on NetBSD, as that is reliable and sensible there. 3Use `uname -p` on NetBSD, as that is reliable and sensible there.
4Handle earmv[67]hf for NetBSD. 4Handle earmv[67]hf for NetBSD.
5Default to non-verbose compilation. 5Default to non-verbose compilation.
6 6
7--- src/bootstrap/bootstrap.py.orig 2021-02-10 17:36:44.000000000 +0000 7--- src/bootstrap/bootstrap.py.orig 2022-09-19 14:07:21.000000000 +0000
8+++ src/bootstrap/bootstrap.py 8+++ src/bootstrap/bootstrap.py
9@@ -278,6 +278,11 @@ def default_build_triple(verbose): 9@@ -244,6 +244,11 @@ def default_build_triple(verbose):
10 'OpenBSD': 'unknown-openbsd' 10 'OpenBSD': 'unknown-openbsd'
11 } 11 }
12  12
13+ # For NetBSD, use `uname -p`, as there it is reliable & sensible 13+ # For NetBSD, use `uname -p`, as there it is reliable & sensible
14+ if ostype == 'NetBSD': 14+ if ostype == 'NetBSD':
15+ cputype = subprocess.check_output( 15+ cputype = subprocess.check_output(
16+ ['uname', '-p']).strip().decode(default_encoding) 16+ ['uname', '-p']).strip().decode(default_encoding)
17+ 17+
18 # Consider the direct transformation first and then the special cases 18 # Consider the direct transformation first and then the special cases
19 if ostype in ostype_mapper: 19 if ostype in ostype_mapper:
20 ostype = ostype_mapper[ostype] 20 ostype = ostype_mapper[ostype]
21@@ -331,6 +336,7 @@ def default_build_triple(verbose): 21@@ -297,6 +302,7 @@ def default_build_triple(verbose):
22 cputype_mapper = { 22 cputype_mapper = {
23 'BePC': 'i686', 23 'BePC': 'i686',
24 'aarch64': 'aarch64', 24 'aarch64': 'aarch64',
25+ 'aarch64eb': 'aarch64', 25+ 'aarch64eb': 'aarch64',
26 'amd64': 'x86_64', 26 'amd64': 'x86_64',
27 'arm64': 'aarch64', 27 'arm64': 'aarch64',
28 'i386': 'i686', 28 'i386': 'i686',
29@@ -369,10 +375,16 @@ def default_build_triple(verbose): 29@@ -335,10 +341,16 @@ def default_build_triple(verbose):
30 ostype = 'linux-androideabi' 30 ostype = 'linux-androideabi'
31 else: 31 else:
32 ostype += 'eabihf' 32 ostype += 'eabihf'
33- elif cputype in {'armv7l', 'armv8l'}: 33- elif cputype in {'armv7l', 'armv8l'}:
34+ elif cputype in {'armv6hf', 'earmv6hf'}: 34+ elif cputype in {'armv6hf', 'earmv6hf'}:
35+ cputype = 'armv6' 35+ cputype = 'armv6'
36+ if ostype == 'unknown-netbsd': 36+ if ostype == 'unknown-netbsd':
37+ ostype += '-eabihf' 37+ ostype += '-eabihf'
38+ elif cputype in {'armv7l', 'armv8l', 'earmv7hf'}: 38+ elif cputype in {'armv7l', 'armv8l', 'earmv7hf'}:
39 cputype = 'armv7' 39 cputype = 'armv7'
40 if ostype == 'linux-android': 40 if ostype == 'linux-android':
41 ostype = 'linux-androideabi' 41 ostype = 'linux-androideabi'
42+ elif ostype == 'unknown-netbsd': 42+ elif ostype == 'unknown-netbsd':
43+ ostype += '-eabihf' 43+ ostype += '-eabihf'
44 else: 44 else:
45 ostype += 'eabihf' 45 ostype += 'eabihf'
46 elif cputype == 'mips': 46 elif cputype == 'mips':
47@@ -791,7 +803,7 @@ class RustBuild(object): 47@@ -757,7 +769,7 @@ class RustBuild(object):
48 self.cargo())) 48 self.cargo()))
49 args = [self.cargo(), "build", "--manifest-path", 49 args = [self.cargo(), "build", "--manifest-path",
50 os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] 50 os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
51- for _ in range(0, self.verbose): 51- for _ in range(0, self.verbose):
52+ for _ in range(1, self.verbose): 52+ for _ in range(1, self.verbose):
53 args.append("--verbose") 53 args.append("--verbose")
54 if self.use_locked_deps: 54 if self.use_locked_deps:
55 args.append("--locked") 55 args.append("--locked")

cvs diff -r1.23 -r1.24 pkgsrc/lang/rust/patches/patch-src_bootstrap_builder.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_bootstrap_builder.rs 2022/10/10 20:34:15 1.23
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_builder.rs 2022/11/15 23:11:14 1.24
@@ -1,36 +1,15 @@ @@ -1,36 +1,15 @@
1$NetBSD: patch-src_bootstrap_builder.rs,v 1.23 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-src_bootstrap_builder.rs,v 1.24 2022/11/15 23:11:14 he Exp $
2 2
3Do not install 'src'. 
4Use @PREFIX@, not $ORIGIN in rpath. 3Use @PREFIX@, not $ORIGIN in rpath.
5Fix RPATH for pkgsrc. 
6Pull in upstream commit 5122bb55 to fix install on illumos. 
7 4
8--- src/bootstrap/builder.rs.orig 2022-06-27 13:37:07.000000000 +0000 5--- src/bootstrap/builder.rs.orig 2022-06-27 13:37:07.000000000 +0000
9+++ src/bootstrap/builder.rs 6+++ src/bootstrap/builder.rs
10@@ -735,7 +735,6 @@ impl<'a> Builder<'a> { 7@@ -1702,7 +1701,7 @@ impl<'a> Builder<'a> {
11 install::Clippy, 
12 install::Miri, 
13 install::Analysis, 
14- install::Src, 
15 install::Rustc 
16 ), 
17 Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest, run::BumpStage0), 
18@@ -1699,7 +1698,7 @@ impl<'a> Builder<'a> { 
19 Some("-Wl,-rpath,@loader_path/../lib") 8 Some("-Wl,-rpath,@loader_path/../lib")
20 } else if !target.contains("windows") { 9 } else if !target.contains("windows") {
21 rustflags.arg("-Clink-args=-Wl,-z,origin"); 10 rustflags.arg("-Clink-args=-Wl,-z,origin");
22- Some("-Wl,-rpath,$ORIGIN/../lib") 11- Some("-Wl,-rpath,$ORIGIN/../lib")
23+ Some("-Wl,-rpath,@PREFIX@/lib") 12+ Some("-Wl,-rpath,@PREFIX@/lib")
24 } else { 13 } else {
25 None 14 None
26 }; 15 };
27@@ -1760,7 +1759,8 @@ impl<'a> Builder<'a> { 
28 let needs_unstable_opts = target.contains("linux") 
29 || target.contains("windows") 
30 || target.contains("bsd") 
31- || target.contains("dragonfly"); 
32+ || target.contains("dragonfly") 
33+ || target.contains("illumos"); 
34  
35 if needs_unstable_opts { 
36 rustflags.arg("-Zunstable-options"); 

cvs diff -r1.17 -r1.18 pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs 2022/10/10 20:34:15 1.17
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs 2022/11/15 23:11:14 1.18
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-src_bootstrap_lib.rs,v 1.17 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-src_bootstrap_lib.rs,v 1.18 2022/11/15 23:11:14 he Exp $
2 2
3Don't filter out optimization flags. 3Don't filter out optimization flags.
4FreeBSD has a particular C++ runtime library name 4FreeBSD has a particular C++ runtime library name
5 5
6--- src/bootstrap/lib.rs.orig 2021-09-06 18:42:35.000000000 +0000 6--- src/bootstrap/lib.rs.orig 2021-09-06 18:42:35.000000000 +0000
7+++ src/bootstrap/lib.rs 7+++ src/bootstrap/lib.rs
8@@ -1050,14 +1050,13 @@ impl Build { 8@@ -954,14 +954,13 @@ impl Build {
9 .args() 9 .args()
10 .iter() 10 .iter()
11 .map(|s| s.to_string_lossy().into_owned()) 11 .map(|s| s.to_string_lossy().into_owned())
12- .filter(|s| !s.starts_with("-O") && !s.starts_with("/O")) 12- .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
13 .collect::<Vec<String>>(); 13 .collect::<Vec<String>>();
14  14
15 // If we're compiling on macOS then we add a few unconditional flags 15 // If we're compiling on macOS then we add a few unconditional flags
16 // indicating that we want libc++ (more filled out than libstdc++) and 16 // indicating that we want libc++ (more filled out than libstdc++) and
17 // we want to compile for 10.7. This way we can ensure that 17 // we want to compile for 10.7. This way we can ensure that
18 // LLVM/etc are all properly compiled. 18 // LLVM/etc are all properly compiled.
19- if target.contains("apple-darwin") { 19- if target.contains("apple-darwin") {
20+ if target.contains("apple-darwin") || target.contains("freebsd") { 20+ if target.contains("apple-darwin") || target.contains("freebsd") {
21 base.push("-stdlib=libc++".into()); 21 base.push("-stdlib=libc++".into());

cvs diff -r1.11 -r1.12 pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs 2022/08/30 19:22:17 1.11
+++ pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs 2022/11/15 23:11:14 1.12
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.11 2022/08/30 19:22:17 he Exp $ 1$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.12 2022/11/15 23:11:14 he Exp $
2 2
3Turn off incremental builds for sparc64, ref. 3Turn off incremental builds for sparc64, ref.
4https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/ 4https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
5 5
6--- src/tools/cargo/src/cargo/core/profiles.rs.orig 2018-10-24 20:01:28.000000000 +0000 6--- src/tools/cargo/src/cargo/core/profiles.rs.orig 2018-10-24 20:01:28.000000000 +0000
7+++ src/tools/cargo/src/cargo/core/profiles.rs 7+++ src/tools/cargo/src/cargo/core/profiles.rs
8@@ -643,6 +643,9 @@ impl Profile { 8@@ -720,6 +720,9 @@ impl Profile {
9 debuginfo: Some(2), 9 debuginfo: Some(2),
10 debug_assertions: true, 10 debug_assertions: true,
11 overflow_checks: true, 11 overflow_checks: true,
12+ #[cfg(target_arch = "sparc64")] 12+ #[cfg(target_arch = "sparc64")]
13+ incremental: false, 13+ incremental: false,
14+ #[cfg(not(target_arch = "sparc64"))] 14+ #[cfg(not(target_arch = "sparc64"))]
15 incremental: true, 15 incremental: true,
16 ..Profile::default() 16 ..Profile::default()
17 } 17 }

cvs diff -r1.7 -r1.8 pkgsrc/lang/rust/patches/patch-vendor_cc_src_lib.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-vendor_cc_src_lib.rs 2022/08/30 19:22:17 1.7
+++ pkgsrc/lang/rust/patches/patch-vendor_cc_src_lib.rs 2022/11/15 23:11:14 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-vendor_cc_src_lib.rs,v 1.7 2022/08/30 19:22:17 he Exp $ 1$NetBSD: patch-vendor_cc_src_lib.rs,v 1.8 2022/11/15 23:11:14 he Exp $
2 2
3Add aarch64_eb. 3Add aarch64_eb.
4 4
5--- vendor/cc/src/lib.rs.orig 2021-07-26 15:20:38.000000000 +0000 5--- vendor/cc/src/lib.rs.orig 2021-07-26 15:20:38.000000000 +0000
6+++ vendor/cc/src/lib.rs 6+++ vendor/cc/src/lib.rs
7@@ -2551,6 +2551,7 @@ impl Build { 7@@ -2382,6 +2382,7 @@ impl Build {
8 "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"), 8 "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
9 "aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"), 9 "aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
10 "aarch64-unknown-netbsd" => Some("aarch64--netbsd"), 10 "aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
11+ "aarch64_be-unknown-netbsd" => Some("aarch64_be--netbsd"), 11+ "aarch64_be-unknown-netbsd" => Some("aarch64_be--netbsd"),
12 "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), 12 "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
13 "armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), 13 "armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
14 "armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), 14 "armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),

cvs diff -r1.7 -r1.8 pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs 2022/10/23 14:48:31 1.7
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs 2022/11/15 23:11:14 1.8
@@ -1,54 +1,57 @@ @@ -1,54 +1,57 @@
1$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.7 2022/10/23 14:48:31 he Exp $ 1$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.8 2022/11/15 23:11:14 he Exp $
2 2
3Provide defaults for the various NetBSD targets. 3Provide defaults for the various NetBSD targets.
4 4
5--- vendor/openssl-src/src/lib.rs.orig 2021-07-26 15:20:39.000000000 +0000 5--- vendor/openssl-src/src/lib.rs.orig 2022-09-19 15:35:02.000000000 +0000
6+++ vendor/openssl-src/src/lib.rs 6+++ vendor/openssl-src/src/lib.rs
7@@ -219,6 +219,8 @@ impl Build { 7@@ -230,6 +230,8 @@ impl Build {
8 "aarch64-unknown-freebsd" => "BSD-generic64", 8 "aarch64-unknown-freebsd" => "BSD-generic64",
9 "aarch64-unknown-linux-gnu" => "linux-aarch64", 9 "aarch64-unknown-linux-gnu" => "linux-aarch64",
10 "aarch64-unknown-linux-musl" => "linux-aarch64", 10 "aarch64-unknown-linux-musl" => "linux-aarch64",
11+ "aarch64-unknown-netbsd" => "BSD-generic64", 11+ "aarch64-unknown-netbsd" => "BSD-generic64",
12+ "aarch64_be-unknown-netbsd" => "BSD-generic64", 12+ "aarch64_be-unknown-netbsd" => "BSD-generic64",
13 "aarch64-pc-windows-msvc" => "VC-WIN64-ARM", 13 "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
14 "arm-linux-androideabi" => "linux-armv4", 14 "arm-linux-androideabi" => "linux-armv4",
15 "armv7-linux-androideabi" => "linux-armv4", 15 "armv7-linux-androideabi" => "linux-armv4",
16@@ -229,11 +231,13 @@ impl Build { 16@@ -240,11 +242,13 @@ impl Build {
17 "armv5te-unknown-linux-gnueabi" => "linux-armv4", 17 "armv5te-unknown-linux-gnueabi" => "linux-armv4",
18 "armv5te-unknown-linux-musleabi" => "linux-armv4", 18 "armv5te-unknown-linux-musleabi" => "linux-armv4",
19 "armv6-unknown-freebsd" => "BSD-generic32", 19 "armv6-unknown-freebsd" => "BSD-generic32",
20+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32", 20+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
21 "armv7-unknown-freebsd" => "BSD-generic32", 21 "armv7-unknown-freebsd" => "BSD-generic32",
22 "armv7-unknown-linux-gnueabi" => "linux-armv4", 22 "armv7-unknown-linux-gnueabi" => "linux-armv4",
23 "armv7-unknown-linux-musleabi" => "linux-armv4", 23 "armv7-unknown-linux-musleabi" => "linux-armv4",
24 "armv7-unknown-linux-gnueabihf" => "linux-armv4", 24 "armv7-unknown-linux-gnueabihf" => "linux-armv4",
25 "armv7-unknown-linux-musleabihf" => "linux-armv4", 25 "armv7-unknown-linux-musleabihf" => "linux-armv4",
26+ "armv7-unknown-netbsd-eabihf" => "BSD-generic32", 26+ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
27 "asmjs-unknown-emscripten" => "gcc", 27 "asmjs-unknown-emscripten" => "gcc",
28 "i586-unknown-linux-gnu" => "linux-elf", 28 "i586-unknown-linux-gnu" => "linux-elf",
29 "i586-unknown-linux-musl" => "linux-elf", 29 "i586-unknown-linux-musl" => "linux-elf",
30@@ -244,6 +248,8 @@ impl Build { 30@@ -255,6 +259,8 @@ impl Build {
31 "i686-unknown-freebsd" => "BSD-x86-elf", 31 "i686-unknown-freebsd" => "BSD-x86-elf",
32 "i686-unknown-linux-gnu" => "linux-elf", 32 "i686-unknown-linux-gnu" => "linux-elf",
33 "i686-unknown-linux-musl" => "linux-elf", 33 "i686-unknown-linux-musl" => "linux-elf",
34+ "i686-unknown-netbsd" => "BSD-x86-elf", 34+ "i686-unknown-netbsd" => "BSD-x86-elf",
35+ "i586-unknown-netbsd" => "BSD-x86-elf", 35+ "i586-unknown-netbsd" => "BSD-x86-elf",
36 "mips-unknown-linux-gnu" => "linux-mips32", 36 "mips-unknown-linux-gnu" => "linux-mips32",
37 "mips-unknown-linux-musl" => "linux-mips32", 37 "mips-unknown-linux-musl" => "linux-mips32",
38 "mips64-unknown-linux-gnuabi64" => "linux64-mips64", 38 "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
39@@ -254,6 +260,7 @@ impl Build { 39@@ -263,8 +269,10 @@ impl Build {
 40 "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
 41 "mipsel-unknown-linux-gnu" => "linux-mips32",
40 "mipsel-unknown-linux-musl" => "linux-mips32", 42 "mipsel-unknown-linux-musl" => "linux-mips32",
 43+ "mipsel-unknown-netbsd" => "BSD-generic32",
41 "powerpc-unknown-freebsd" => "BSD-generic32", 44 "powerpc-unknown-freebsd" => "BSD-generic32",
42 "powerpc-unknown-linux-gnu" => "linux-ppc", 45 "powerpc-unknown-linux-gnu" => "linux-ppc",
43+ "powerpc-unknown-netbsd" => "BSD-generic32", 46+ "powerpc-unknown-netbsd" => "BSD-generic32",
44 "powerpc64-unknown-freebsd" => "BSD-generic64", 47 "powerpc64-unknown-freebsd" => "BSD-generic64",
45 "powerpc64-unknown-linux-gnu" => "linux-ppc64", 48 "powerpc64-unknown-linux-gnu" => "linux-ppc64",
46 "powerpc64-unknown-linux-musl" => "linux-ppc64", 49 "powerpc64-unknown-linux-musl" => "linux-ppc64",
47@@ -263,6 +270,7 @@ impl Build { 50@@ -274,6 +282,7 @@ impl Build {
48 "riscv64gc-unknown-linux-gnu" => "linux-generic64", 51 "riscv64gc-unknown-linux-gnu" => "linux-generic64",
49 "s390x-unknown-linux-gnu" => "linux64-s390x", 52 "s390x-unknown-linux-gnu" => "linux64-s390x",
50 "s390x-unknown-linux-musl" => "linux64-s390x", 53 "s390x-unknown-linux-musl" => "linux64-s390x",
51+ "sparc64-unknown-netbsd" => "BSD-generic64", 54+ "sparc64-unknown-netbsd" => "BSD-generic64",
52 "x86_64-apple-darwin" => "darwin64-x86_64-cc", 55 "x86_64-apple-darwin" => "darwin64-x86_64-cc",
53 "x86_64-linux-android" => "linux-x86_64", 56 "x86_64-linux-android" => "linux-x86_64",
54 "x86_64-pc-windows-gnu" => "mingw64", 57 "x86_64-pc-windows-gnu" => "mingw64",

cvs diff -r1.7 -r1.8 pkgsrc/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs 2022/08/30 19:22:17 1.7
+++ pkgsrc/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs 2022/11/15 23:11:14 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.7 2022/08/30 19:22:17 he Exp $ 1$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.8 2022/11/15 23:11:14 he Exp $
2 2
3Add aarch64_eb for NetBSD. 3Add aarch64_eb for NetBSD.
4 4
5--- vendor/target-lexicon/src/targets.rs.orig 2021-05-03 21:35:46.000000000 +0000 5--- vendor/target-lexicon/src/targets.rs.orig 2021-05-03 21:35:46.000000000 +0000
6+++ vendor/target-lexicon/src/targets.rs 6+++ vendor/target-lexicon/src/targets.rs
7@@ -1332,6 +1332,7 @@ mod tests { 7@@ -1287,6 +1287,7 @@ mod tests {
8 "aarch64-unknown-linux-gnu_ilp32", 8 "aarch64-unknown-linux-gnu_ilp32",
9 "aarch64-unknown-linux-musl", 9 "aarch64-unknown-linux-musl",
10 "aarch64-unknown-netbsd", 10 "aarch64-unknown-netbsd",
11+ "aarch64_be-unknown-netbsd", 11+ "aarch64_be-unknown-netbsd",
12 "aarch64-unknown-none", 12 "aarch64-unknown-none",
13 "aarch64-unknown-none-softfloat", 13 "aarch64-unknown-none-softfloat",
14 "aarch64-unknown-openbsd", 14 "aarch64-unknown-openbsd",

File Deleted: pkgsrc/lang/rust/patches/Attic/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs

cvs diff -r1.3 -r1.4 pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs (expand / switch to unified diff)

--- pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs 2022/10/10 20:34:15 1.3
+++ pkgsrc/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs 2022/11/15 23:11:14 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.3 2022/10/10 20:34:15 he Exp $ 1$NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.4 2022/11/15 23:11:14 he Exp $
2 2
3Copy execinfo function definitions from openbsd's mod.rs. 3Copy execinfo function definitions from openbsd's mod.rs.
4 4
5--- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-05-10 20:59:35.217463943 +0000 5--- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2022-05-10 20:59:35.217463943 +0000
6+++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs 6+++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
7@@ -2821,6 +2821,22 @@ extern "C" { 7@@ -2821,6 +2821,22 @@ extern "C" {
8 pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry; 8 pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
9 } 9 }
10  10
11+#[link(name = "execinfo")] 11+#[link(name = "execinfo")]
12+extern "C" { 12+extern "C" {
13+ pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t; 13+ pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
14+ pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char; 14+ pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char;
@@ -17,13 +17,26 @@ Copy execinfo function definitions from  @@ -17,13 +17,26 @@ Copy execinfo function definitions from
17+ len: ::size_t, 17+ len: ::size_t,
18+ fd: ::c_int, 18+ fd: ::c_int,
19+ ) -> ::c_int; 19+ ) -> ::c_int;
20+ pub fn backtrace_symbols_fmt( 20+ pub fn backtrace_symbols_fmt(
21+ addrlist: *const *mut ::c_void, 21+ addrlist: *const *mut ::c_void,
22+ len: ::size_t, 22+ len: ::size_t,
23+ fmt: *const ::c_char, 23+ fmt: *const ::c_char,
24+ ) -> *mut *mut ::c_char; 24+ ) -> *mut *mut ::c_char;
25+} 25+}
26+ 26+
27 cfg_if! { 27 cfg_if! {
28 if #[cfg(target_arch = "aarch64")] { 28 if #[cfg(target_arch = "aarch64")] {
29 mod aarch64; 29 mod aarch64;
 30@@ -2840,6 +2856,12 @@ cfg_if! {
 31 } else if #[cfg(target_arch = "x86")] {
 32 mod x86;
 33 pub use self::x86::*;
 34+ } else if #[cfg(target_arch = "mips")] {
 35+ mod mips;
 36+ pub use self::mips::*;
 37+ } else if #[cfg(target_arch = "mipsel")] {
 38+ mod mips;
 39+ pub use self::mips::*;
 40 } else {
 41 // Unknown target_arch
 42 }