Skip to content

Commit feb67b3

Browse files
he32he32
committed
rust: Upgrade to version 1.69.0.
Pkgsrc changes: * Adjust patches and cargo checksums to new versions. Upstream changes: Version 1.69.0 (2023-04-20) ========================== Language -------- - [Deriving built-in traits on packed structs works with `Copy` fields.] (rust-lang/rust#104429) - [Stabilize the `cmpxchg16b` target feature on x86 and x86_64.] (rust-lang/rust#106774) - [Improve analysis of trait bounds for associated types.] (rust-lang/rust#103695) - [Allow associated types to be used as union fields.] (rust-lang/rust#106938) - [Allow `Self: Autotrait` bounds on dyn-safe trait methods.] (rust-lang/rust#107082) - [Treat `str` as containing `[u8]` for auto trait purposes.] (rust-lang/rust#107941) Compiler -------- - [Upgrade `*-pc-windows-gnu` on CI to mingw-w64 v10 and GCC 12.2.] (rust-lang/rust#100178) - [Rework min_choice algorithm of member constraints.] (rust-lang/rust#105300) - [Support `true` and `false` as boolean flags in compiler arguments.] (rust-lang/rust#107043) - [Default `repr(C)` enums to `c_int` size.] (rust-lang/rust#107592) Libraries --------- - [Implement the unstable `DispatchFromDyn` for cell types, allowing downstream experimentation with custom method receivers.] (rust-lang/rust#97373) - [Document that `fmt::Arguments::as_str()` may return `Some(_)` in more cases after optimization, subject to change.] (rust-lang/rust#106823) - [Implement `AsFd` and `AsRawFd` for `Rc`.] (rust-lang/rust#107317) Stabilized APIs --------------- - [`CStr::from_bytes_until_nul`] (https://doc.rust-lang.org/stable/core/ffi/struct.CStr.html#method.from_bytes_until_nul) - [`core::ffi::FromBytesUntilNulError`] (https://doc.rust-lang.org/stable/core/ffi/struct.FromBytesUntilNulError.html) These APIs are now stable in const contexts: - [`SocketAddr::new`] (https://doc.rust-lang.org/stable/std/net/enum.SocketAddr.html#method.new) - [`SocketAddr::ip`] (https://doc.rust-lang.org/stable/std/net/enum.SocketAddr.html#method.ip) - [`SocketAddr::port`] (https://doc.rust-lang.org/stable/std/net/enum.SocketAddr.html#method.port) - [`SocketAddr::is_ipv4`] (https://doc.rust-lang.org/stable/std/net/enum.SocketAddr.html#method.is_ipv4) - [`SocketAddr::is_ipv6`] (https://doc.rust-lang.org/stable/std/net/enum.SocketAddr.html#method.is_ipv6) - [`SocketAddrV4::new`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV4.html#method.new) - [`SocketAddrV4::ip`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV4.html#method.ip) - [`SocketAddrV4::port`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV4.html#method.port) - [`SocketAddrV6::new`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV6.html#method.new) - [`SocketAddrV6::ip`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV6.html#method.ip) - [`SocketAddrV6::port`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV6.html#method.port) - [`SocketAddrV6::flowinfo`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV6.html#method.flowinfo) - [`SocketAddrV6::scope_id`] (https://doc.rust-lang.org/stable/std/net/struct.SocketAddrV6.html#method.scope_id) Cargo ----- - [Cargo now suggests `cargo fix` or `cargo clippy --fix` when compilation warnings are auto-fixable.] (rust-lang/cargo#11558) - [Cargo now suggests `cargo add` if you try to install a library crate.] (rust-lang/cargo#11410) - [Cargo now sets the `CARGO_BIN_NAME` environment variable also for binary examples.] (rust-lang/cargo#11705) Rustdoc ----- - [Vertically compact trait bound formatting.] (rust-lang/rust#102842) - [Only include stable lints in `rustdoc::all` group.] (rust-lang/rust#106316) - [Compute maximum Levenshtein distance based on the query.] (rust-lang/rust#107141) - [Remove inconsistently-present sidebar tooltips.] (rust-lang/rust#107490) - [Search by macro when query ends with `!`.] (rust-lang/rust#108143) Compatibility Notes ------------------- - [The `rust-analysis` component from `rustup` now only contains a warning placeholder.] (rust-lang/rust#101841) This was primarily intended for RLS, and the corresponding `-Zsave-analysis` flag has been removed from the compiler as well. - [Unaligned references to packed fields are now a hard error.] (rust-lang/rust#102513) This has been a warning since 1.53, and denied by default with a future-compatibility warning since 1.62. - [Update the minimum external LLVM to 14.] (rust-lang/rust#107573) - [Cargo now emits errors on invalid characters in a registry token.] (rust-lang/cargo#11600) - [When `default-features` is set to false of a workspace dependency, and an inherited dependency of a member has `default-features = true`, Cargo will enable default features of that dependency.] (rust-lang/cargo#11409) - [Cargo denies `CARGO_HOME` in the `[env]` configuration table. Cargo itself doesn't pick up this value, but recursive calls to cargo would, which was not intended.] (rust-lang/cargo#11644) - [Debuginfo for build dependencies is now off if not explicitly set. This is expected to improve the overall build time.] (rust-lang/cargo#11252) 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. - [Move `format_args!()` into AST (and expand it during AST lowering)] (rust-lang/rust#106745)
1 parent ef31aee commit feb67b3

14 files changed

+279
-330
lines changed

‎lang/rust/Makefile

+61-70
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# $NetBSD: Makefile,v 1.281 2023/04/19 08:10:36 adam Exp $
1+
# $NetBSD: Makefile,v 1.282 2023/05/03 22:39:09 he Exp $
22

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

@@ -107,9 +106,9 @@ BUILD_TARGET?= dist
107106
BUILD_TARGET?= build
108107
.endif
109108

110-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
111-
!empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \
112-
!empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
109+
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
110+
${MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf} || \
111+
${MACHINE_PLATFORM:MNetBSD-*-mipsel} || \
113112
!empty(TARGET:Marmv[67]-unknown-netbsd-eabihf) || \
114113
!empty(TARGET:Mmipsel-unknown-netbsd)
115114
# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc
@@ -126,7 +125,7 @@ CONFIGURE_ARGS+= --debuginfo-level-tests=0
126125
.endif
127126

128127
# Only build the ARM target on/for this host, due to resource constraints
129-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf)
128+
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf}
130129
CONFIGURE_ARGS+= --set llvm.targets="ARM"
131130
.endif
132131
# When cross-building for ARM on X86, X86 needs to go along due
@@ -135,7 +134,7 @@ CONFIGURE_ARGS+= --set llvm.targets="ARM"
135134
CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
136135
.endif
137136
# Same for mips:
138-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
137+
.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel}
139138
CONFIGURE_ARGS+= --set llvm.targets="Mips"
140139
.endif
141140
.if !empty(TARGET:Mmipsel-unknown-netbsd)
@@ -176,10 +175,6 @@ CHECK_INTERPRETER_SKIP+= lib/rustlib/src/rust/library/stdarch/ci/dox.sh
176175
#
177176
# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
178177
# \todo Consider avoiding setting this on netbsd-9 past the fix.
179-
# Release 9.x and 9.1 or later is OK
180-
. if ${OPSYS} == "NetBSD" && 090099 < ${OPSYS_VERSION} && ${OPSYS_VERSION} < 090900
181-
MAKE_JOBS_SAFE?= yes
182-
. endif
183178
. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099957
184179
MAKE_JOBS_SAFE?= no
185180
. endif
@@ -202,7 +197,7 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
202197
# breaks linking, see https://github.com/rust-lang/rust/issues/81790. Until
203198
# this can be located (proving difficult!) we just force it.
204199
#
205-
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
200+
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
206201
BUILDLINK_TRANSFORM+= opt:x86_64:arm64
207202
.endif
208203

@@ -214,50 +209,50 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
214209
#
215210
DISTFILES:= ${DEFAULT_DISTFILES}
216211

217-
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
218-
RUST_STAGE0_VER= 1.67.1
212+
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
213+
RUST_STAGE0_VER= 1.68.2
219214
RUST_ARCH:= aarch64-apple-darwin
220215
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
221216
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
222217
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
223218
.endif
224-
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
225-
RUST_STAGE0_VER= 1.67.1
219+
.if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
220+
RUST_STAGE0_VER= 1.68.2
226221
RUST_ARCH:= x86_64-apple-darwin
227222
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
228223
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
229224
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
230225
.endif
231-
.if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
232-
RUST_STAGE0_VER= 1.67.1
226+
.if ${MACHINE_PLATFORM:MLinux-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
227+
RUST_STAGE0_VER= 1.68.2
233228
RUST_ARCH:= aarch64-unknown-linux-gnu
234229
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
235230
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
236231
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
237232
.endif
238-
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
239-
RUST_STAGE0_VER= 1.67.1
233+
.if ${MACHINE_PLATFORM:MLinux-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
234+
RUST_STAGE0_VER= 1.68.2
240235
RUST_ARCH:= arm-unknown-linux-gnueabihf
241236
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
242237
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
243238
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
244239
.endif
245-
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
246-
RUST_STAGE0_VER= 1.67.1
240+
.if ${MACHINE_PLATFORM:MLinux-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
241+
RUST_STAGE0_VER= 1.68.2
247242
RUST_ARCH:= armv7-unknown-linux-gnueabihf
248243
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
249244
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
250245
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
251246
.endif
252-
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
253-
RUST_STAGE0_VER= 1.67.1
247+
.if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make (makesum) || make(mdi)
248+
RUST_STAGE0_VER= 1.68.2
254249
RUST_ARCH:= i686-unknown-linux-gnu
255250
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
256251
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
257252
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
258253
.endif
259-
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
260-
RUST_STAGE0_VER= 1.67.1
254+
.if ${MACHINE_PLATFORM:MLinux-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
255+
RUST_STAGE0_VER= 1.68.2
261256
RUST_ARCH:= x86_64-unknown-linux-gnu
262257
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
263258
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -268,7 +263,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
268263
# are built on. If you wish to target Oracle Solaris you'll need to create an
269264
# x86_64-sun-solaris bootstrap and comment out the overrides.
270265
#
271-
.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
266+
.if ${MACHINE_PLATFORM:MSunOS-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
272267
RUST_STAGE0_VER= 1.68.2
273268
RUST_ARCH:= x86_64-unknown-illumos
274269
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -281,15 +276,15 @@ CONFIGURE_ARGS+= --build=${RUST_ARCH}
281276
CONFIGURE_ARGS+= --host=${RUST_ARCH}
282277
CONFIGURE_ARGS+= --target=${RUST_ARCH}
283278
.endif
284-
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
285-
RUST_STAGE0_VER= 1.67.1
279+
.if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
280+
RUST_STAGE0_VER= 1.68.2
286281
RUST_ARCH:= x86_64-unknown-freebsd
287282
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
288283
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
289284
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
290285
.endif
291-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
292-
RUST_STAGE0_VER= 1.67.1
286+
.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi)
287+
RUST_STAGE0_VER= 1.68.2
293288
RUST_ARCH= i586-unknown-netbsd
294289
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
295290
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -308,15 +303,15 @@ pre-build-fix-paxctl:
308303
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
309304
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
310305
.endif
311-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
312-
RUST_STAGE0_VER= 1.67.1
306+
.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
307+
RUST_STAGE0_VER= 1.68.2
313308
RUST_ARCH= x86_64-unknown-netbsd
314309
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
315310
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
316311
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
317312
.endif
318-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
319-
RUST_STAGE0_VER= 1.67.1
313+
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
314+
RUST_STAGE0_VER= 1.68.2
320315
RUST_ARCH= powerpc-unknown-netbsd
321316

322317
# Cross-built against NetBSD 9.0
@@ -338,54 +333,54 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
338333
. endif
339334

340335
.endif
341-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
342-
RUST_STAGE0_VER= 1.67.1
336+
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
337+
RUST_STAGE0_VER= 1.68.2
343338
RUST_ARCH= aarch64-unknown-netbsd
344339
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
345340
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
346341
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
347342
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
348343
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
349344
.endif
350-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
351-
RUST_STAGE0_VER= 1.67.1
345+
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
346+
RUST_STAGE0_VER= 1.68.2
352347
RUST_ARCH= aarch64_be-unknown-netbsd
353348
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
354349
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
355350
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
356351
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
357352
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
358353
.endif
359-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
360-
RUST_STAGE0_VER= 1.67.1
354+
.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
355+
RUST_STAGE0_VER= 1.68.2
361356
RUST_ARCH= sparc64-unknown-netbsd
362357
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
363358
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
364359
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
365360
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
366361
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
367362
.endif
368-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
363+
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
369364
RUST_ARCH= armv7-unknown-netbsd-eabihf
370-
RUST_STAGE0_VER= 1.67.1
365+
RUST_STAGE0_VER= 1.68.2
371366
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
372367
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
373368
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
374369
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
375370
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
376371
.endif
377-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
372+
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
378373
RUST_ARCH= armv6-unknown-netbsd-eabihf
379-
RUST_STAGE0_VER= 1.67.1
374+
RUST_STAGE0_VER= 1.68.2
380375
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
381376
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
382377
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
383378
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
384379
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
385380
.endif
386-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || make(distinfo) || make (makesum) || make(mdi)
381+
.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
387382
RUST_ARCH= mipsel-unknown-netbsd
388-
RUST_STAGE0_VER= 1.67.1
383+
RUST_STAGE0_VER= 1.68.2
389384
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
390385
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
391386
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -424,23 +419,21 @@ SUBST_VARS.rpath= PREFIX
424419
# updating and verification.
425420
#
426421

427-
CKSUM_CRATES+= vendor/cc
428-
CKSUMS+= 2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
429-
CKSUMS+= a8e8ff94141ffd6760f10e9359a206badc792ce068f3fed8a5b5e06ebe9a72a4
422+
#CKSUM_CRATES+= vendor/cc
423+
#CKSUMS+= 2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
424+
#CKSUMS+= a8e8ff94141ffd6760f10e9359a206badc792ce068f3fed8a5b5e06ebe9a72a4
430425

431426
CKSUM_CRATES+= vendor/libc
427+
CKSUMS+= b1c0a1d347b30d45c85429b7236d234f5b2c86b9eec439e897c9371d856c187a
428+
CKSUMS+= 280468ba8d1efca96895eed707a72ec577aef65ac15b10caca0b3124504d9f11
432429
CKSUMS+= 107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
433430
CKSUMS+= 62169589a535636bee360c767d8014c63ba2042e4d7d3078b118987947b194b8
434-
CKSUMS+= eace25beaa4874bfc2451f8136efc261f9dfb7a30caab3c97c708068d5431bbf
435-
CKSUMS+= 6599ee48c3bcdc27a18c58d45197e14c9d1c578d792cb3fb55d8a09469758780
436-
437-
CKSUM_CRATES+= vendor/libc-0.2.135
438-
CKSUMS+= fa260decf53280d4fdf714af60f42d4774f8d6f2da71b0a55a6c2a85e422eb57
439-
CKSUMS+= 43ab44efb1111d2cd1bd6a99da147150d24017b46feadb7f8d77fb92e9c9487d
440431

441432
CKSUM_CRATES+= vendor/libc-0.2.137
442433
CKSUMS+= 77009c0e2e06abf8e81634bb65c22a0ccf9564a7cc64cee62d08b8ea716b8cac
443-
CKSUMS+= fff8565d973350afdf1efd29a2ae7409eeb84b8a61bf16f78827f66a3b5babb2
434+
CKSUMS+= fe5911a550e975c2df8ccb96f1195e41f5286609afb53f4a3d28bf7c63b6031c
435+
436+
#CKSUM_CRATES+= vendor/libc-0.2.138
444437

445438
CKSUM_CRATES+= vendor/lzma-sys
446439
CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -450,14 +443,12 @@ CKSUM_CRATES+= vendor/stacker
450443
CKSUMS+= 59ca847887cf19387119d18c57f08d5a8520d714876ca0142b8f1c001ecde06b
451444
CKSUMS+= 03be8ae293b713fe6e9703e4809dd68caaec992bae6777914ffddae8da2a9bc7
452445

453-
CKSUM_CRATES+= vendor/kqueue
454-
CKSUMS+= 900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
455-
CKSUMS+= 9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
446+
#CKSUM_CRATES+= vendor/kqueue
447+
#CKSUMS+= 900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
448+
#CKSUMS+= 9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
456449

457450
CKSUM_CRATES+= vendor/crossbeam-epoch
458451
CKSUM_CRATES+= vendor/crossbeam-utils
459-
CKSUM_CRATES+= vendor/crossbeam-utils-0.8.12
460-
CKSUM_CRATES+= vendor/crossbeam-epoch-0.9.11
461452
CKSUMS+= 3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
462453
CKSUMS+= ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
463454
CKSUMS+= f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
@@ -474,8 +465,8 @@ CKSUMS+= d397af804c0b786978867528635fa9148cd2ad0e6abd591ace21b5bd3719c38d
474465
CKSUMS+= 246d1f71852a08745fba8d00f126d2bd7816c9428d568a0d5e4907e69548ab9b
475466

476467
CKSUM_CRATES+= vendor/nix
477-
CKSUMS+= 44e642a29e4bc296607816e93c80f4134a7664c209702b9bb52a1cac01a67c45
478-
CKSUMS+= 6021b32badb51064fdca5fd083289be16763675bb6bf059ee3886791709931bf
468+
CKSUMS+= c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939
469+
CKSUMS+= 263bd7ace66a4cfee3de18532f61c187327fcbd564666b4f97c4b01ae6885d98
479470

480471
SUBST_CLASSES+= cksum
481472
SUBST_STAGE.cksum= pre-configure
@@ -671,17 +662,17 @@ stage0-bootstrap: install
671662
# rust i386 and sparc64 bootstraps are built for 8.0
672663
# and still depend on libstdc++.so.8.
673664
# Pull in compat80 on 9.x and newer.
674-
.if (!empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
675-
!empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)) \
665+
.if (${MACHINE_PLATFORM:MNetBSD-*-i386} || \
666+
${MACHINE_PLATFORM:MNetBSD-*-sparc64}) \
676667
&& empty(OS_VERSION:M8.*)
677668
BUILD_DEPENDS+= compat80>=0:../../emulators/compat80
678669
.endif
679670

680671
.include "../../mk/atomic64.mk"
681672
# This is for when we build natively:
682-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
683-
!empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
684-
!empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
673+
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
674+
${MACHINE_PLATFORM:MNetBSD-*-i386} || \
675+
${MACHINE_PLATFORM:MNetBSD-*-mipsel}
685676
# Make libatomic library available via a unique directory:
686677
DEPENDS+= libatomic-links>=0:../../devel/libatomic-links
687678
.endif

0 commit comments

Comments
 (0)