Skip to content

Commit 6914509

Browse files
he32he32
committed
rust: Upgrade to version 1.70.0.
Pkgsrc changes: * Adjust patches and cargo checksums to new versions. * Add support for NetBSD/riscv64. Upstream changes: Version 1.70.0 (2023-06-01) ========================== Language -------- - [Relax ordering rules for `asm!` operands] (rust-lang/rust#105798) - [Properly allow macro expanded `format_args` invocations to uses captures] (rust-lang/rust#106505) - [Lint ambiguous glob re-exports] (rust-lang/rust#107880) - [Perform const and unsafe checking for expressions in `let _ = expr` position.] (rust-lang/rust#102256) Compiler -------- - [Extend -Cdebuginfo with new options and named aliases] (rust-lang/rust#109808) This provides a smaller version of debuginfo for cases that only need line number information (`-Cdebuginfo=line-tables-only`), which may eventually become the default for `-Cdebuginfo=1`. - [Make `unused_allocation` lint against `Box::new` too] (rust-lang/rust#104363) - [Detect uninhabited types early in const eval] (rust-lang/rust#109435) - [Switch to LLD as default linker for {arm,thumb}v4t-none-eabi] (rust-lang/rust#109721) - [Add tier 3 target `loongarch64-unknown-linux-gnu`] (rust-lang/rust#96971) - [Add tier 3 target for `i586-pc-nto-qnx700`(QNX Neutrino RTOS, version 7.0)] (rust-lang/rust#109173), - [Insert alignment checks for pointer dereferences as debug assertions] (rust-lang/rust#98112) This catches undefined behavior at runtime, and may cause existing code to fail. Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Document NonZeroXxx layout guarantees] (rust-lang/rust#94786) - [Windows: make `Command` prefer non-verbatim paths] (rust-lang/rust#96391) - [Implement Default for some alloc/core iterators] (rust-lang/rust#99929) - [Fix handling of trailing bare CR in str::lines] (rust-lang/rust#100311) - [allow negative numeric literals in `concat!`] (rust-lang/rust#106844) - [Add documentation about the memory layout of `Cell`] (rust-lang/rust#106921) - [Use `partial_cmp` to implement tuple `lt`/`le`/`ge`/`gt`] (rust-lang/rust#108157) - [Stabilize `atomic_as_ptr`] (rust-lang/rust#108419) - [Stabilize `nonnull_slice_from_raw_parts`] (rust-lang/rust#97506) - [Partial stabilization of `once_cell`] (rust-lang/rust#105587) - [Stabilize `nonzero_min_max`] (rust-lang/rust#106633) - [Flatten/inline format_args!() and (string and int) literal arguments into format_args!()] (rust-lang/rust#106824) - [Stabilize movbe target feature] (rust-lang/rust#107711) - [don't splice from files into pipes in io::copy] (rust-lang/rust#108283) - [Add a builtin unstable `FnPtr` trait that is implemented for all function pointers] (rust-lang/rust#108080) This extends `Debug`, `Pointer`, `Hash`, `PartialEq`, `Eq`, `PartialOrd`, and `Ord` implementations for function pointers with all ABIs. Stabilized APIs --------------- - [`NonZero*::MIN/MAX`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroI8.html#associatedconstant.MIN) - [`BinaryHeap::retain`] (https://doc.rust-lang.org/stable/std/collections/struct.BinaryHeap.html#method.retain) - [`Default for std::collections::binary_heap::IntoIter`] (https://doc.rust-lang.org/stable/std/collections/binary_heap/struct.IntoIter.html) - [`Default for std::collections::btree_map::{IntoIter, Iter, IterMut}`] (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoIter.html) - [`Default for std::collections::btree_map::{IntoKeys, Keys}`] (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoKeys.html) - [`Default for std::collections::btree_map::{IntoValues, Values}`] (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoKeys.html) - [`Default for std::collections::btree_map::Range`] (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.Range.html) - [`Default for std::collections::btree_set::{IntoIter, Iter}`] (https://doc.rust-lang.org/stable/std/collections/btree_set/struct.IntoIter.html) - [`Default for std::collections::btree_set::Range`] (https://doc.rust-lang.org/stable/std/collections/btree_set/struct.Range.html) - [`Default for std::collections::linked_list::{IntoIter, Iter, IterMut}`] (https://doc.rust-lang.org/stable/alloc/collections/linked_list/struct.IntoIter.html) - [`Default for std::vec::IntoIter`] (https://doc.rust-lang.org/stable/alloc/vec/struct.IntoIter.html#impl-Default-for-IntoIter%3CT,+A%3E) - [`Default for std::iter::Chain`] (https://doc.rust-lang.org/stable/std/iter/struct.Chain.html) - [`Default for std::iter::Cloned`] (https://doc.rust-lang.org/stable/std/iter/struct.Cloned.html) - [`Default for std::iter::Copied`] (https://doc.rust-lang.org/stable/std/iter/struct.Copied.html) - [`Default for std::iter::Enumerate`] (https://doc.rust-lang.org/stable/std/iter/struct.Enumerate.html) - [`Default for std::iter::Flatten`] (https://doc.rust-lang.org/stable/std/iter/struct.Flatten.html) - [`Default for std::iter::Fuse`] (https://doc.rust-lang.org/stable/std/iter/struct.Fuse.html) - [`Default for std::iter::Rev`] (https://doc.rust-lang.org/stable/std/iter/struct.Rev.html) - [`Default for std::slice::Iter`] (https://doc.rust-lang.org/stable/std/slice/struct.Iter.html) - [`Default for std::slice::IterMut`] (https://doc.rust-lang.org/stable/std/slice/struct.IterMut.html) - [`Rc::into_inner`] (https://doc.rust-lang.org/stable/alloc/rc/struct.Rc.html#method.into_inner) - [`Arc::into_inner`] (https://doc.rust-lang.org/stable/alloc/sync/struct.Arc.html#method.into_inner) - [`std::cell::OnceCell`] (https://doc.rust-lang.org/stable/std/cell/struct.OnceCell.html) - [`Option::is_some_and`] (https://doc.rust-lang.org/stable/std/option/enum.Option.html#method.is_some_and) - [`NonNull::slice_from_raw_parts`] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.slice_from_raw_parts) - [`Result::is_ok_and`] (https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.is_ok_and) - [`Result::is_err_and`] (https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.is_err_and) - [`std::sync::atomic::Atomic*::as_ptr`] (https://doc.rust-lang.org/stable/std/sync/atomic/struct.AtomicU8.html#method.as_ptr) - [`std::io::IsTerminal`] (https://doc.rust-lang.org/stable/std/io/trait.IsTerminal.html) - [`std::os::linux::net::SocketAddrExt`] (https://doc.rust-lang.org/stable/std/os/linux/net/trait.SocketAddrExt.html) - [`std::os::unix::net::UnixDatagram::bind_addr`] (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixDatagram.html#method.bind_addr) - [`std::os::unix::net::UnixDatagram::connect_addr`] (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixDatagram.html#method.connect_addr) - [`std::os::unix::net::UnixDatagram::send_to_addr`] (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixDatagram.html#method.send_to_addr) - [`std::os::unix::net::UnixListener::bind_addr`] (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixListener.html#method.bind_addr) - [`std::path::Path::as_mut_os_str`] (https://doc.rust-lang.org/stable/std/path/struct.Path.html#method.as_mut_os_str) - [`std::sync::OnceLock`] (https://doc.rust-lang.org/stable/std/sync/struct.OnceLock.html) Cargo ----- - [Add `CARGO_PKG_README`] (rust-lang/cargo#11645) - [Make `sparse` the default protocol for crates.io] (rust-lang/cargo#11791) - [Accurately show status when downgrading dependencies] (rust-lang/cargo#11839) - [Use registry.default for login/logout] (rust-lang/cargo#11949) - [Stabilize `cargo logout`] (rust-lang/cargo#11950) Misc ---- - [Stabilize rustdoc `--test-run-directory`] (rust-lang/rust#103682) Compatibility Notes ------------------- - [Prevent stable `libtest` from supporting `-Zunstable-options`] (rust-lang/rust#109044) - [Perform const and unsafe checking for expressions in `let _ = expr` position.] (rust-lang/rust#102256) - [WebAssembly targets enable `sign-ext` and `mutable-globals` features in codegen] (rust-lang/rust#109807) This may cause incompatibility with older execution environments. - [Insert alignment checks for pointer dereferences as debug assertions] (rust-lang/rust#98112) This catches undefined behavior at runtime, and may cause existing code to fail. 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. - [Upgrade to LLVM 16] (rust-lang/rust#109474) - [Use SipHash-1-3 instead of SipHash-2-4 for StableHasher] (rust-lang/rust#107925)
1 parent da7caf4 commit 6914509

22 files changed

+470
-247
lines changed

‎lang/rust/Makefile‎

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.286 2023/07/03 20:38:20 jperkin Exp $
1+
# $NetBSD: Makefile,v 1.287 2023/07/10 12:01:24 he Exp $
22

3-
DISTNAME= rustc-1.69.0-src
3+
DISTNAME= rustc-1.70.0-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
55
CATEGORIES= lang
66
MASTER_SITES= https://static.rust-lang.org/dist/
@@ -12,11 +12,11 @@ LICENSE= mit OR apache-2.0
1212

1313
CONFLICTS+= rust-bin-[0-9]*
1414

15-
# LLVM uses gcc7, follow suit. Also, uses -std=c++14
15+
# LLVM requires gcc7, follow suit. Also, uses -std=c++17
1616
GCC_REQD+= 7
1717

1818
USE_GCC_RUNTIME= yes
19-
USE_LANGUAGES= c c++11
19+
USE_LANGUAGES= c c++17
2020
USE_LIBTOOL= yes
2121
USE_TOOLS+= bash grep gmake perl:build pkg-config
2222

@@ -68,9 +68,7 @@ MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
6868
# that any conflicting packages pulled in via dependencies are not buildlinked.
6969
BUILDLINK_FILES_CMD.libssh2= ${TRUE}
7070
BUILDLINK_FILES_CMD.xz= ${TRUE}
71-
72-
# Use the bundled lzma.
73-
MAKE_ENV+= LZMA_API_STATIC=1
71+
MAKE_ENV+= LZMA_API_STATIC=1
7472

7573
# MacOS X 10.7 is the oldest supported version. See
7674
# ${WRKSRC}/src/bootstrap/lib.rs
@@ -177,12 +175,8 @@ CHECK_INTERPRETER_SKIP+= lib/rustlib/src/rust/library/stdarch/ci/dox.sh
177175
# PR is open for this.) \todo Understand and fix.
178176
#
179177
# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
180-
# \todo Consider avoiding setting this on netbsd-9 past the fix.
181-
# Release 9.x and 9.1 or later is OK
182-
. if ${OPSYS} == "NetBSD" && 090099 < ${OPSYS_VERSION} && ${OPSYS_VERSION} < 090900
183-
MAKE_JOBS_SAFE?= yes
184-
. endif
185-
. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099957
178+
# Release 9.x and 9.1 or later is OK.
179+
. if ${OPSYS} == "NetBSD" && 090999 < ${OPSYS_VERSION} && ${OPSYS_VERSION} < 090900
186180
MAKE_JOBS_SAFE?= no
187181
. endif
188182

@@ -217,49 +211,49 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
217211
DISTFILES:= ${DEFAULT_DISTFILES}
218212

219213
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
220-
RUST_STAGE0_VER= 1.68.2
214+
RUST_STAGE0_VER= 1.69.0
221215
RUST_ARCH:= aarch64-apple-darwin
222216
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
223217
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
224218
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
225219
.endif
226220
.if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
227-
RUST_STAGE0_VER= 1.68.2
221+
RUST_STAGE0_VER= 1.69.0
228222
RUST_ARCH:= x86_64-apple-darwin
229223
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
230224
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
231225
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
232226
.endif
233227
.if ${MACHINE_PLATFORM:MLinux-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
234-
RUST_STAGE0_VER= 1.68.2
228+
RUST_STAGE0_VER= 1.69.0
235229
RUST_ARCH:= aarch64-unknown-linux-gnu
236230
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
237231
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
238232
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
239233
.endif
240234
.if ${MACHINE_PLATFORM:MLinux-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
241-
RUST_STAGE0_VER= 1.68.2
235+
RUST_STAGE0_VER= 1.69.0
242236
RUST_ARCH:= arm-unknown-linux-gnueabihf
243237
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
244238
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
245239
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
246240
.endif
247241
.if ${MACHINE_PLATFORM:MLinux-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
248-
RUST_STAGE0_VER= 1.68.2
242+
RUST_STAGE0_VER= 1.69.0
249243
RUST_ARCH:= armv7-unknown-linux-gnueabihf
250244
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
251245
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
252246
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
253247
.endif
254248
.if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make (makesum) || make(mdi)
255-
RUST_STAGE0_VER= 1.68.2
249+
RUST_STAGE0_VER= 1.69.0
256250
RUST_ARCH:= i686-unknown-linux-gnu
257251
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
258252
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
259253
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
260254
.endif
261255
.if ${MACHINE_PLATFORM:MLinux-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
262-
RUST_STAGE0_VER= 1.68.2
256+
RUST_STAGE0_VER= 1.69.0
263257
RUST_ARCH:= x86_64-unknown-linux-gnu
264258
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
265259
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -271,7 +265,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
271265
# x86_64-sun-solaris bootstrap and comment out the overrides.
272266
#
273267
.if ${MACHINE_PLATFORM:MSunOS-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
274-
RUST_STAGE0_VER= 1.68.2
268+
RUST_STAGE0_VER= 1.69.0
275269
RUST_ARCH:= x86_64-unknown-illumos
276270
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
277271
SITES.${RUST_STAGE0}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
@@ -284,14 +278,14 @@ CONFIGURE_ARGS+= --host=${RUST_ARCH}
284278
CONFIGURE_ARGS+= --target=${RUST_ARCH}
285279
.endif
286280
.if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
287-
RUST_STAGE0_VER= 1.68.2
281+
RUST_STAGE0_VER= 1.69.0
288282
RUST_ARCH:= x86_64-unknown-freebsd
289283
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
290284
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
291285
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
292286
.endif
293287
.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi)
294-
RUST_STAGE0_VER= 1.68.2
288+
RUST_STAGE0_VER= 1.69.0
295289
RUST_ARCH= i586-unknown-netbsd
296290
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
297291
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -311,14 +305,14 @@ pre-build-fix-paxctl:
311305
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
312306
.endif
313307
.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
314-
RUST_STAGE0_VER= 1.68.2
308+
RUST_STAGE0_VER= 1.69.0
315309
RUST_ARCH= x86_64-unknown-netbsd
316310
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
317311
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
318312
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
319313
.endif
320314
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
321-
RUST_STAGE0_VER= 1.68.2
315+
RUST_STAGE0_VER= 1.69.0
322316
RUST_ARCH= powerpc-unknown-netbsd
323317

324318
# Cross-built against NetBSD 9.0
@@ -341,7 +335,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
341335

342336
.endif
343337
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
344-
RUST_STAGE0_VER= 1.68.2
338+
RUST_STAGE0_VER= 1.69.0
345339
RUST_ARCH= aarch64-unknown-netbsd
346340
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
347341
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -350,7 +344,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
350344
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
351345
.endif
352346
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
353-
RUST_STAGE0_VER= 1.68.2
347+
RUST_STAGE0_VER= 1.69.0
354348
RUST_ARCH= aarch64_be-unknown-netbsd
355349
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
356350
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -359,7 +353,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
359353
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
360354
.endif
361355
.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
362-
RUST_STAGE0_VER= 1.68.2
356+
RUST_STAGE0_VER= 1.69.0
363357
RUST_ARCH= sparc64-unknown-netbsd
364358
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
365359
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -369,7 +363,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
369363
.endif
370364
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
371365
RUST_ARCH= armv7-unknown-netbsd-eabihf
372-
RUST_STAGE0_VER= 1.68.2
366+
RUST_STAGE0_VER= 1.69.0
373367
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
374368
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
375369
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -378,7 +372,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
378372
.endif
379373
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
380374
RUST_ARCH= armv6-unknown-netbsd-eabihf
381-
RUST_STAGE0_VER= 1.68.2
375+
RUST_STAGE0_VER= 1.69.0
382376
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
383377
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
384378
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -387,7 +381,16 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
387381
.endif
388382
.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
389383
RUST_ARCH= mipsel-unknown-netbsd
390-
RUST_STAGE0_VER= 1.68.2
384+
RUST_STAGE0_VER= 1.69.0
385+
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
386+
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
387+
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
388+
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
389+
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
390+
.endif
391+
.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
392+
RUST_ARCH= riscv64gc-unknown-netbsd
393+
RUST_STAGE0_VER= 1.70.0
391394
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
392395
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
393396
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -426,21 +429,23 @@ SUBST_VARS.rpath= PREFIX
426429
# updating and verification.
427430
#
428431

429-
#CKSUM_CRATES+= vendor/cc
430-
#CKSUMS+= 2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
431-
#CKSUMS+= a8e8ff94141ffd6760f10e9359a206badc792ce068f3fed8a5b5e06ebe9a72a4
432+
CKSUM_CRATES+= vendor/cc-1.0.73
433+
CKSUMS+= 38970d678de0efb4b5e2978265daa8a613a1db35fc42e669621b03fc56d5b138
434+
CKSUMS+= 65de0d6593a4256e5fcaf898f9468d71bab672c70a2dfab3dcb8514e9b72819c
432435

433-
CKSUM_CRATES+= vendor/libc
434-
CKSUMS+= b1c0a1d347b30d45c85429b7236d234f5b2c86b9eec439e897c9371d856c187a
435-
CKSUMS+= 280468ba8d1efca96895eed707a72ec577aef65ac15b10caca0b3124504d9f11
436-
CKSUMS+= 107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
437-
CKSUMS+= 62169589a535636bee360c767d8014c63ba2042e4d7d3078b118987947b194b8
436+
CKSUM_CRATES+= vendor/cc-1.0.77
437+
CKSUMS+= 2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
438+
CKSUMS+= 2b7150f466b9e0617b2c3755450db2090232f27561687d462b0a8ac0518fce87
438439

439-
CKSUM_CRATES+= vendor/libc-0.2.137
440-
CKSUMS+= 77009c0e2e06abf8e81634bb65c22a0ccf9564a7cc64cee62d08b8ea716b8cac
441-
CKSUMS+= fe5911a550e975c2df8ccb96f1195e41f5286609afb53f4a3d28bf7c63b6031c
440+
CKSUM_CRATES+= vendor/libc
441+
CKSUMS+= 6442ed05eb390d44a03daa9800af1030f2ee3e61db98675262c227b28de51937
442+
CKSUMS+= ec554c837999c718786debfcfe2241984193751fcd52156323b418d96319aa95
443+
CKSUMS+= 4493317993af390d8aafc2cb7ace4c349dfc9d2451fd666844f04a4fa1f47442
444+
CKSUMS+= e5414483c02597e67a0aa27db7501f1a98c43ffee0151aa320586dded51f41cb
442445

443-
#CKSUM_CRATES+= vendor/libc-0.2.138
446+
CKSUM_CRATES+= vendor/libc-0.2.139
447+
CKSUMS+= 107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
448+
CKSUMS+= 4be83bef456569d59405edf134e7fe8eff78f3fe35f1efd60e15405d5c822725
444449

445450
CKSUM_CRATES+= vendor/lzma-sys
446451
CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -450,10 +455,6 @@ CKSUM_CRATES+= vendor/stacker
450455
CKSUMS+= 59ca847887cf19387119d18c57f08d5a8520d714876ca0142b8f1c001ecde06b
451456
CKSUMS+= 03be8ae293b713fe6e9703e4809dd68caaec992bae6777914ffddae8da2a9bc7
452457

453-
#CKSUM_CRATES+= vendor/kqueue
454-
#CKSUMS+= 900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
455-
#CKSUMS+= 9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
456-
457458
CKSUM_CRATES+= vendor/crossbeam-epoch
458459
CKSUM_CRATES+= vendor/crossbeam-utils
459460
CKSUMS+= 3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
@@ -462,14 +463,16 @@ CKSUMS+= f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
462463
CKSUMS+= ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
463464

464465
CKSUM_CRATES+= vendor/openssl-src
465-
CKSUMS+= 40cd1069246b552b04fcdfd13eb77b3a89194192f18c426b77377a78abbfd72f
466-
CKSUMS+= f358adc7b69c478ca89a96505f9a28f51cc6ad481bcdd304d5089e112c0904db
467-
CKSUMS+= b3c59089fa4151eb978a55f17e2adff6ceb752d579b64962336b49cefe41776b
468-
CKSUMS+= db49cdc41015692a4dd2076a33d694c3371a6720db176742cb6c509d533a1fcd
466+
CKSUMS+= 090744f85cf99a9b8412c23fca1eabb61eb45d830f0f9f0e7309be2572c1e827
467+
CKSUMS+= 4261f87c06e6505afd9f7bdafe5aebdd153a1c6f928203cec2dd125642d60fc1
468+
CKSUMS+= 9aeed598f844ca5b63cf222052b44fc643d6cb47a879c286b46c34bbbba618df
469+
CKSUMS+= 20ce1c7048d0f1168a5a00e7608c8da2205a6bbdd906f69c1f5a0e6e173db8ea
469470

470471
CKSUM_CRATES+= vendor/openssl-sys
471-
CKSUMS+= d397af804c0b786978867528635fa9148cd2ad0e6abd591ace21b5bd3719c38d
472-
CKSUMS+= 246d1f71852a08745fba8d00f126d2bd7816c9428d568a0d5e4907e69548ab9b
472+
CKSUMS+= d04538b63898180949bc7d9ced4806395011a3f6c5d374d4ebfdf2b30cd9cc33
473+
CKSUMS+= 5972bc8c1549820108b53df23ee1a9fb7c3d40c2c198a855a5afdf563cbafb26
474+
CKSUMS+= 1f9233e5993c3537767d39b66fa5a43f5268a9bf89b70884886652cfa7e869c6
475+
CKSUMS+= 93dd56b8ea8c24678cf390232a1de7bbf0de64a5eaa40da95848e22e611c6dcb
473476
CKSUMS+= 5b3f48d529657f212e69883f9d3f599d0e1fc9a64f1389cc3760029b4ad6a423
474477
CKSUMS+= ab6b0ec78a2eefeaf0fc5f45afa783fa254d5efe856401c0b34d4d05ef9b3dd4
475478

‎lang/rust/cross.mk‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: cross.mk,v 1.10 2023/01/23 18:49:03 he Exp $
1+
# $NetBSD: cross.mk,v 1.11 2023/07/10 12:01:24 he Exp $
22

33
# These settings may be used to cross-build rust.
44
#
@@ -16,11 +16,11 @@
1616
#CROSS_ROOT= /u/evbarm-armv6hf
1717
#CROSS_ROOT= /u/sparc64
1818
#CROSS_ROOT= /u/macppc
19-
#CROSS_ROOT= /u/9.0-macppc
2019
#CROSS_ROOT= /u/evbarm64
2120
#CROSS_ROOT= /u/evbarm64eb
2221
#CROSS_ROOT= /u/i386
2322
#CROSS_ROOT= /u/mipsel
23+
#CROSS_ROOT= /u/riscv64
2424
#CROSS_ROOT= /
2525
#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT}
2626

@@ -33,6 +33,7 @@
3333
#GNU_CROSS_TARGET= aarch64_be--netbsd
3434
#GNU_CROSS_TARGET= i486--netbsdelf
3535
#GNU_CROSS_TARGET= mipsel--netbsd
36+
#GNU_CROSS_TARGET= riscv64--netbsd
3637
#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
3738

3839
# To cross-build rust, you need to specify
@@ -48,6 +49,7 @@
4849
#TARGET= i686-unknown-netbsd
4950
#TARGET= i586-unknown-netbsd
5051
#TARGET= mipsel-unknown-netbsd
52+
#TARGET= riscv64gc-unknown-netbsd
5153
#
5254
#SCRIPTS= ${WRKDIR}/scripts
5355
#CONFIGURE_ARGS+= --host=${TARGET}

0 commit comments

Comments
 (0)