Skip to content

Commit 277ecdc

Browse files
he32he32
committed
lang/rust: update to version 1.81.0, taken from pkgsrc-wip.
Pkgsrc changes: * Adapt patches, apply to new vendored crates where needed. * Back-port rust pull request 130110, "make dist vendoring configurable" * Disable "dist vendoring", otherwise cargo would try to access the network during the build phase. Upstream changes: Version 1.81.0 (2024-09-05) ========================== Language -------- - [Abort on uncaught panics in `extern "C"` functions.] (rust-lang/rust#116088) - [Fix ambiguous cases of multiple `&` in elided self lifetimes.] (rust-lang/rust#117967) - [Stabilize `#[expect]` for lints (RFC 2383),] (rust-lang/rust#120924) like `#[allow]` with a warning if the lint is _not_ fulfilled. - [Change method resolution to constrain hidden types instead of rejecting method candidates.] (rust-lang/rust#123962) - [Bump `elided_lifetimes_in_associated_constant` to deny.] (rust-lang/rust#124211) - [`offset_from`: always allow pointers to point to the same address.] (rust-lang/rust#124921) - [Allow constraining opaque types during subtyping in the trait system.] (rust-lang/rust#125447) - [Allow constraining opaque types during various unsizing casts.] (rust-lang/rust#125610) - [Deny keyword lifetimes pre-expansion.] (rust-lang/rust#126762) Compiler -------- - [Make casts of pointers to trait objects stricter.] (rust-lang/rust#120248) - [Check alias args for well-formedness even if they have escaping bound vars.] (rust-lang/rust#123737) - [Deprecate no-op codegen option `-Cinline-threshold=...`.] (rust-lang/rust#124712) - [Re-implement a type-size based limit.] (rust-lang/rust#125507) - [Properly account for alignment in `transmute` size checks.] (rust-lang/rust#125740) - [Remove the `box_pointers` lint.] (rust-lang/rust#126018) - [Ensure the interpreter checks bool/char for validity when they are used in a cast.] (rust-lang/rust#126265) - [Improve coverage instrumentation for functions containing nested items.] (rust-lang/rust#127199) - Target changes: - [Add Tier 3 `no_std` Xtensa targets:] (rust-lang/rust#125141) `xtensa-esp32-none-elf`, `xtensa-esp32s2-none-elf`, `xtensa-esp32s3-none-elf` - [Add Tier 3 `std` Xtensa targets:] (rust-lang/rust#126380) `xtensa-esp32-espidf`, `xtensa-esp32s2-espidf`, `xtensa-esp32s3-espidf` - [Add Tier 3 i686 Redox OS target:] (rust-lang/rust#126192) `i686-unknown-redox` - [Promote `arm64ec-pc-windows-msvc` to Tier 2.] (rust-lang/rust#126039) - [Promote `wasm32-wasip2` to Tier 2.] (rust-lang/rust#126967) - [Promote `loongarch64-unknown-linux-musl` to Tier 2 with host tools.] (rust-lang/rust#126298) - [Enable full tools and profiler for LoongArch Linux targets.] (rust-lang/rust#127078) - [Unconditionally warn on usage of `wasm32-wasi`.] (rust-lang/rust#126662) (see compatibility note below) - Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Split core's `PanicInfo` and std's `PanicInfo`.] (rust-lang/rust#115974) (see compatibility note below) - [Generalize `{Rc,Arc}::make_mut()` to unsized types.] (rust-lang/rust#116113) - [Replace sort implementations with stable `driftsort` and unstable `ipnsort`.] (rust-lang/rust#124032) All `slice::sort*` and `slice::select_nth*` methods are expected to see significant performance improvements. See the [research project] (https://github.com/Voultapher/sort-research-rs) for more details. - [Document behavior of `create_dir_all` with respect to empty paths.] (rust-lang/rust#125112) - [Fix interleaved output in the default panic hook when multiple threads panic simultaneously.] (rust-lang/rust#127397) - Fix `Command`'s batch files argument escaping not working when file name has trailing whitespace or periods (CVE-2024-43402). Stabilized APIs --------------- - [`core::error`] (https://doc.rust-lang.org/stable/core/error/index.html) - [`hint::assert_unchecked`] (https://doc.rust-lang.org/stable/core/hint/fn.assert_unchecked.html) - [`fs::exists`] (https://doc.rust-lang.org/stable/std/fs/fn.exists.html) - [`AtomicBool::fetch_not`] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicBool.html#method.fetch_not) - [`Duration::abs_diff`] (https://doc.rust-lang.org/stable/core/time/struct.Duration.html#method.abs_diff) - [`IoSlice::advance`] (https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance) - [`IoSlice::advance_slices`] (https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance_slices) - [`IoSliceMut::advance`] (https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance) - [`IoSliceMut::advance_slices`] (https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance_slices) - [`PanicHookInfo`] (https://doc.rust-lang.org/stable/std/panic/struct.PanicHookInfo.html) - [`PanicInfo::message`] (https://doc.rust-lang.org/stable/core/panic/struct.PanicInfo.html#method.message) - [`PanicMessage`] (https://doc.rust-lang.org/stable/core/panic/struct.PanicMessage.html) These APIs are now stable in const contexts: - [`char::from_u32_unchecked`] (https://doc.rust-lang.org/stable/core/char/fn.from_u32_unchecked.html) (function) - [`char::from_u32_unchecked`] (https://doc.rust-lang.org/stable/core/primitive.char.html#method.from_u32_unchecked) (method) - [`CStr::count_bytes`] (https://doc.rust-lang.org/stable/core/ffi/c_str/struct.CStr.html#method.count_bytes) - [`CStr::from_ptr`] (https://doc.rust-lang.org/stable/core/ffi/c_str/struct.CStr.html#method.from_ptr) Cargo ----- - [Generated `.cargo_vcs_info.json` is always included, even when `--allow-dirty` is passed.] (rust-lang/cargo#13960) - [Disallow `package.license-file` and `package.readme` pointing to non-existent files during packaging.] (rust-lang/cargo#13921) - [Disallow passing `--release`/`--debug` flag along with the `--profile` flag.] (rust-lang/cargo#13971) - [Remove `lib.plugin` key support in `Cargo.toml`. Rust plugin support has been deprecated for four years and was removed in 1.75.0.] (rust-lang/cargo#13902) Compatibility Notes ------------------- * Usage of the `wasm32-wasi` target will now issue a compiler warning and request users switch to the `wasm32-wasip1` target instead. Both targets are the same, `wasm32-wasi` is only being renamed, and this [change to the WASI target] (https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html) is being done to enable removing `wasm32-wasi` in January 2025. * We have renamed `std::panic::PanicInfo` to `std::panic::PanicHookInfo`. The old name will continue to work as an alias, but will result in a deprecation warning starting in Rust 1.82.0. `core::panic::PanicInfo` will remain unchanged, however, as this is now a *different type*. The reason is that these types have different roles: `std::panic::PanicHookInfo` is the argument to the [panic hook](https://doc.rust-lang.org/stable/std/panic/fn.set_hook.html) in std context (where panics can have an arbitrary payload), while `core::panic::PanicInfo` is the argument to the [`#[panic_handler]`](https://doc.rust-lang.org/nomicon/panic-handler.html) in no_std context (where panics always carry a formatted *message*). Separating these types allows us to add more useful methods to these types, such as `std::panic::PanicHookInfo::payload_as_str()` and `core::panic::PanicInfo::message()`. * The new sort implementations may panic if a type's implementation of [`Ord`](https://doc.rust-lang.org/std/cmp/trait.Ord.html) (or the given comparison function) does not implement a [total order](https://en.wikipedia.org/wiki/Total_order) as the trait requires. `Ord`'s supertraits (`PartialOrd`, `Eq`, and `PartialEq`) must also be consistent. The previous implementations would not "notice" any problem, but the new implementations have a good chance of detecting inconsistencies, throwing a panic rather than returning knowingly unsorted data. * [In very rare cases, a change in the internal evaluation order of the trait solver may result in new fatal overflow errors.] (rust-lang/rust#126128) 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. - [Add a Rust-for Linux `auto` CI job to check kernel builds.] (rust-lang/rust#125209)
1 parent b714e07 commit 277ecdc

23 files changed

+552
-271
lines changed

‎lang/rust/Makefile‎

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# $NetBSD: Makefile,v 1.320 2024/11/14 22:20:32 wiz Exp $
1+
# $NetBSD: Makefile,v 1.321 2024/11/24 16:13:42 he Exp $
22

3-
DISTNAME= rustc-1.80.1-src
3+
DISTNAME= rustc-1.81.0-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5-
PKGREVISION= 3
65
CATEGORIES= lang
76
MASTER_SITES= https://static.rust-lang.org/dist/
87

@@ -20,6 +19,13 @@ USE_LANGUAGES= c c++
2019
USE_LIBTOOL= yes
2120
USE_TOOLS+= bash grep gmake perl:build pkg-config
2221

22+
# This is a bug:
23+
# https://github.com/rust-lang/rust/issues/130708
24+
# "Building rust 1.81.0 does network access in the "build" phase"
25+
# but set it for now to allow progress in finding other build issues.
26+
#ALLOW_NETWORK_ACCESS= yes
27+
# Ref. dist.vendor below.
28+
2329
# The NetBSD bootstraps are built for NetBSD 9 (because rust doesn't
2430
# build on 8 or earlier), or because the target didn't exist in 8
2531
# or 9 (as in riscv64). Therefore, mark earlier versions as broken.
@@ -42,6 +48,8 @@ CONFIGURE_ARGS+= --disable-compiler-docs
4248
CONFIGURE_ARGS+= --disable-llvm-static-stdcpp
4349
CONFIGURE_ARGS+= --disable-ninja
4450
CONFIGURE_ARGS+= --dist-compression-formats=xz
51+
# Ref. issue #130708 & backport of pull-request 130110
52+
CONFIGURE_ARGS+= --set dist.vendor=false
4553

4654
# Include (optional) settings to cross-build rust
4755
.include "cross.mk"
@@ -201,52 +209,50 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
201209
#
202210
DISTFILES:= ${DEFAULT_DISTFILES}
203211

204-
NB= nb1
205-
206212
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
207-
RUST_STAGE0_VER= 1.79.0
213+
RUST_STAGE0_VER= 1.80.1
208214
RUST_ARCH:= aarch64-apple-darwin
209215
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
210216
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
211217
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
212218
.endif
213219
.if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
214-
RUST_STAGE0_VER= 1.79.0
220+
RUST_STAGE0_VER= 1.80.1
215221
RUST_ARCH:= x86_64-apple-darwin
216222
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
217223
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
218224
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
219225
.endif
220226
.if ${MACHINE_PLATFORM:MLinux-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
221-
RUST_STAGE0_VER= 1.79.0
227+
RUST_STAGE0_VER= 1.80.1
222228
RUST_ARCH:= aarch64-unknown-linux-gnu
223229
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
224230
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
225231
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
226232
.endif
227233
.if ${MACHINE_PLATFORM:MLinux-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
228-
RUST_STAGE0_VER= 1.79.0
234+
RUST_STAGE0_VER= 1.80.1
229235
RUST_ARCH:= arm-unknown-linux-gnueabihf
230236
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
231237
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
232238
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
233239
.endif
234240
.if ${MACHINE_PLATFORM:MLinux-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
235-
RUST_STAGE0_VER= 1.79.0
241+
RUST_STAGE0_VER= 1.80.1
236242
RUST_ARCH:= armv7-unknown-linux-gnueabihf
237243
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
238244
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
239245
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
240246
.endif
241247
.if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make (makesum) || make(mdi)
242-
RUST_STAGE0_VER= 1.79.0
248+
RUST_STAGE0_VER= 1.80.1
243249
RUST_ARCH:= i686-unknown-linux-gnu
244250
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
245251
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
246252
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
247253
.endif
248254
.if ${MACHINE_PLATFORM:MLinux-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
249-
RUST_STAGE0_VER= 1.79.0
255+
RUST_STAGE0_VER= 1.80.1
250256
RUST_ARCH:= x86_64-unknown-linux-gnu
251257
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
252258
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -258,7 +264,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
258264
# x86_64-sun-solaris bootstrap and comment out the overrides.
259265
#
260266
.if ${MACHINE_PLATFORM:MSunOS-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
261-
RUST_STAGE0_VER= 1.79.0
267+
RUST_STAGE0_VER= 1.80.1
262268
RUST_ARCH:= x86_64-unknown-illumos
263269
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
264270
SITES.${RUST_STAGE0}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
@@ -271,14 +277,14 @@ CONFIGURE_ARGS+= --host=${RUST_ARCH}
271277
CONFIGURE_ARGS+= --target=${RUST_ARCH}
272278
.endif
273279
.if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
274-
RUST_STAGE0_VER= 1.79.0
280+
RUST_STAGE0_VER= 1.80.1
275281
RUST_ARCH:= x86_64-unknown-freebsd
276282
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
277283
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
278284
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
279285
.endif
280286
.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi)
281-
RUST_STAGE0_VER= 1.79.0
287+
RUST_STAGE0_VER= 1.80.1
282288
RUST_ARCH= i586-unknown-netbsd
283289
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
284290
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -298,14 +304,14 @@ pre-build-fix-paxctl:
298304
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
299305
.endif
300306
.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
301-
RUST_STAGE0_VER= 1.79.0
307+
RUST_STAGE0_VER= 1.80.1
302308
RUST_ARCH= x86_64-unknown-netbsd
303309
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
304310
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
305311
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
306312
.endif
307313
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
308-
RUST_STAGE0_VER= 1.79.0
314+
RUST_STAGE0_VER= 1.80.1
309315
RUST_ARCH= powerpc-unknown-netbsd
310316

311317
# Cross-built against NetBSD 9.0
@@ -317,10 +323,10 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
317323

318324
.endif
319325
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
320-
RUST_STAGE0_VER= 1.79.0
326+
RUST_STAGE0_VER= 1.80.1
321327
RUST_ARCH= aarch64-unknown-netbsd
322-
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz
323-
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz
328+
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
329+
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
324330
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
325331
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
326332
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
@@ -335,7 +341,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
335341
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
336342
.endif
337343
.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
338-
RUST_STAGE0_VER= 1.79.0
344+
RUST_STAGE0_VER= 1.80.1
339345
RUST_ARCH= sparc64-unknown-netbsd
340346
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
341347
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -345,25 +351,25 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
345351
.endif
346352
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
347353
RUST_ARCH= armv7-unknown-netbsd-eabihf
348-
RUST_STAGE0_VER= 1.79.0
349-
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz
350-
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz
354+
RUST_STAGE0_VER= 1.80.1
355+
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
356+
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
351357
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
352358
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
353359
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
354360
.endif
355361
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
356362
RUST_ARCH= armv6-unknown-netbsd-eabihf
357-
RUST_STAGE0_VER= 1.79.0
358-
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz
359-
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB}.tar.xz
363+
RUST_STAGE0_VER= 1.80.1
364+
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
365+
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
360366
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
361367
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
362368
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
363369
.endif
364370
#.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
365371
#RUST_ARCH= mipsel-unknown-netbsd
366-
#RUST_STAGE0_VER= 1.79.0
372+
#RUST_STAGE0_VER= 1.80.1
367373
#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
368374
#RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
369375
#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -372,7 +378,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
372378
#.endif
373379
.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
374380
RUST_ARCH= riscv64gc-unknown-netbsd
375-
RUST_STAGE0_VER= 1.79.0
381+
RUST_STAGE0_VER= 1.80.1
376382
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
377383
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
378384
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -432,10 +438,6 @@ CKSUM_CRATES+= vendor/libc-0.2.155
432438
CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
433439
CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
434440

435-
CKSUM_CRATES+= vendor/libc-0.2.154
436-
CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
437-
CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
438-
439441
CKSUM_CRATES+= vendor/zerocopy-0.7.32
440442
CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
441443
CKSUMS+= abe079743c2b2dea5b2c42564f98741a5eb9e24ff019e01742ace5581e53c06f
@@ -456,6 +458,18 @@ CKSUMS+= 1b26fca824c410077780fbc2f4c53c1d195ba3bdf6785b529ceb0a11f039cec2
456458
CKSUMS+= 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b
457459
CKSUMS+= 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0
458460

461+
CKSUM_CRATES+= vendor/memchr-2.7.4
462+
CKSUMS+= 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0
463+
CKSUMS+= 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450
464+
CKSUMS+= 7763472d43c66df596ca0697c07db0b4666d38a6a14f64f9f298aaf756c4a715
465+
CKSUMS+= 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af
466+
CKSUMS+= 3b15d5cb9715f26e655598eacbb8bbba74cbe8ddb2fb969d13aa75f216a118dd
467+
CKSUMS+= 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af
468+
CKSUMS+= 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b
469+
CKSUMS+= 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0
470+
CKSUMS+= 44cd1a614bd66f1e66fc86c541d3c3b8d3a14a644c13e8bf816df3f555eac2d4
471+
CKSUMS+= 27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720
472+
459473
CKSUM_CRATES+= vendor/memchr-2.7.1
460474
CKSUMS+= 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0
461475
CKSUMS+= 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450
@@ -634,7 +648,7 @@ stage0-bootstrap: install
634648
${CP} `${PKG_CC} -print-file-name=$${lib}` \
635649
${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
636650
done; \
637-
for lib in libLLVM-17.so libcrypto.so.3 libcurl.so.4 \
651+
for lib in libLLVM.so.18.1 libcrypto.so.3 libcurl.so.4 \
638652
libssl.so.3 libz.so.1 libzstd.so.1; do \
639653
${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
640654
done; \

‎lang/rust/cargo.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: cargo.mk,v 1.39 2024/10/11 12:42:10 jperkin Exp $
1+
# $NetBSD: cargo.mk,v 1.40 2024/11/24 16:13:42 he Exp $
22
#
33
# Common logic that can be used by packages that depend on cargo crates
44
# from crates.io. This lets existing pkgsrc infrastructure fetch and verify

‎lang/rust/cross.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: cross.mk,v 1.11 2023/07/10 12:01:24 he Exp $
1+
# $NetBSD: cross.mk,v 1.12 2024/11/24 16:13:42 he Exp $
22

33
# These settings may be used to cross-build rust.
44
#
@@ -13,6 +13,7 @@
1313
# to do a cross-build. The wrapper script assumes dest/ and tools/
1414
# as a result of a cross-build of NetBSD as subdirectories of this root
1515
#CROSS_ROOT= /u/evbarm-armv7hf
16+
#CROSS_ROOT= /u/evbarm-armv7hf-10.0
1617
#CROSS_ROOT= /u/evbarm-armv6hf
1718
#CROSS_ROOT= /u/sparc64
1819
#CROSS_ROOT= /u/macppc

0 commit comments

Comments
 (0)