Skip to content

Commit 6df74fe

Browse files
he32he32
committed
lang/rust: update to version 1.60.0.
Pkgsrc changes: * Bump available bootstraps to 1.59.0. * Adjust line number in patches which had non-zero offsets. Upstream changes: Version 1.60.0 (2022-04-07) =========================== Language -------- - [Stabilize `#[cfg(panic = "...")]` for either `"unwind"` or `"abort"`.] [93658] - [Stabilize `#[cfg(target_has_atomic = "...")]` for each integer size and `"ptr"`.][93824] Compiler -------- - [Enable combining `+crt-static` and `relocation-model=pic` on `x86_64-unknown-linux-gnu`][86374] - [Fixes wrong `unreachable_pub` lints on nested and glob public reexport][87487] - [Stabilize `-Z instrument-coverage` as `-C instrument-coverage`][90132] - [Stabilize `-Z print-link-args` as `--print link-args`][91606] - [Add new Tier 3 target `mips64-openwrt-linux-musl`\*][92300] - [Add new Tier 3 target `armv7-unknown-linux-uclibceabi` (softfloat)\*][92383] - [Fix invalid removal of newlines from doc comments][92357] - [Add kernel target for RustyHermit][92670] - [Deny mixing bin crate type with lib crate types][92933] - [Make rustc use `RUST_BACKTRACE=full` by default][93566] - [Upgrade to LLVM 14][93577] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Guarantee call order for `sort_by_cached_key`][89621] - [Improve `Duration::try_from_secs_f32`/`f64` accuracy by directly processing exponent and mantissa][90247] - [Make `Instant::{duration_since, elapsed, sub}` saturating][89926] - [Remove non-monotonic clocks workarounds in `Instant::now`][89926] - [Make `BuildHasherDefault`, `iter::Empty` and `future::Pending` covariant][92630] Stabilized APIs --------------- - [`Arc::new_cyclic`][arc_new_cyclic] - [`Rc::new_cyclic`][rc_new_cyclic] - [`slice::EscapeAscii`][slice_escape_ascii] - [`<[u8]>::escape_ascii`][slice_u8_escape_ascii] - [`u8::escape_ascii`][u8_escape_ascii] - [`Vec::spare_capacity_mut`][vec_spare_capacity_mut] - [`MaybeUninit::assume_init_drop`][assume_init_drop] - [`MaybeUninit::assume_init_read`][assume_init_read] - [`i8::abs_diff`][i8_abs_diff] - [`i16::abs_diff`][i16_abs_diff] - [`i32::abs_diff`][i32_abs_diff] - [`i64::abs_diff`][i64_abs_diff] - [`i128::abs_diff`][i128_abs_diff] - [`isize::abs_diff`][isize_abs_diff] - [`u8::abs_diff`][u8_abs_diff] - [`u16::abs_diff`][u16_abs_diff] - [`u32::abs_diff`][u32_abs_diff] - [`u64::abs_diff`][u64_abs_diff] - [`u128::abs_diff`][u128_abs_diff] - [`usize::abs_diff`][usize_abs_diff] - [`Display for io::ErrorKind`][display_error_kind] - [`From<u8> for ExitCode`][from_u8_exit_code] - [`Not for !` (the "never" type)][not_never] - [_Op_`Assign<$t> for Wrapping<$t>`][wrapping_assign_ops] - [`arch::is_aarch64_feature_detected!`][is_aarch64_feature_detected] Cargo ----- - [Port cargo from `toml-rs` to `toml_edit`][cargo/10086] - [Stabilize `-Ztimings` as `--timings`][cargo/10245] - [Stabilize namespaced and weak dependency features.][cargo/10269] - [Accept more `cargo:rustc-link-arg-*` types from build script output.][cargo/10274] - [cargo-new should not add ignore rule on Cargo.lock inside subdirs][cargo/10379] Misc ---- - [Ship docs on Tier 2 platforms by reusing the closest Tier 1 platform docs][92800] - [Drop rustc-docs from complete profile][93742] - [bootstrap: tidy up flag handling for llvm build][93918] Compatibility Notes ------------------- - [Remove compiler-rt linking hack on Android][83822] - [Mitigations for platforms with non-monotonic clocks have been removed from `Instant::now`][89926]. On platforms that don't provide monotonic clocks, an instant is not guaranteed to be greater than an earlier instant anymore. - [`Instant::{duration_since, elapsed, sub}` do not panic anymore on underflow, saturating to `0` instead][89926]. In the real world the panic happened mostly on platforms with buggy monotonic clock implementations rather than catching programming errors like reversing the start and end times. Such programming errors will now results in `0` rather than a panic. - In a future release we're planning to increase the baseline requirements for the Linux kernel to version 3.2, and for glibc to version 2.17. We'd love your feedback in [PR #95026][95026]. Internal Changes ---------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Switch all libraries to the 2021 edition][92068] [83822]: rust-lang/rust#83822 [86374]: rust-lang/rust#86374 [87487]: rust-lang/rust#87487 [89621]: rust-lang/rust#89621 [89926]: rust-lang/rust#89926 [90132]: rust-lang/rust#90132 [90247]: rust-lang/rust#90247 [91606]: rust-lang/rust#91606 [92068]: rust-lang/rust#92068 [92300]: rust-lang/rust#92300 [92357]: rust-lang/rust#92357 [92383]: rust-lang/rust#92383 [92630]: rust-lang/rust#92630 [92670]: rust-lang/rust#92670 [92800]: rust-lang/rust#92800 [92933]: rust-lang/rust#92933 [93566]: rust-lang/rust#93566 [93577]: rust-lang/rust#93577 [93658]: rust-lang/rust#93658 [93742]: rust-lang/rust#93742 [93824]: rust-lang/rust#93824 [93918]: rust-lang/rust#93918 [95026]: rust-lang/rust#95026 [cargo/10086]: rust-lang/cargo#10086 [cargo/10245]: rust-lang/cargo#10245 [cargo/10269]: rust-lang/cargo#10269 [cargo/10274]: rust-lang/cargo#10274 [cargo/10379]: rust-lang/cargo#10379 [arc_new_cyclic]: https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#method.new_cyclic [rc_new_cyclic]: https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#method.new_cyclic [slice_escape_ascii]: https://doc.rust-lang.org/stable/std/slice/struct.EscapeAscii.html [slice_u8_escape_ascii]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.escape_ascii [u8_escape_ascii]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.escape_ascii [vec_spare_capacity_mut]: https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#method.spare_capacity_mut [assume_init_drop]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.assume_init_drop [assume_init_read]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.assume_init_read [i8_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.abs_diff [i16_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.abs_diff [i32_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.abs_diff [i64_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.abs_diff [i128_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.abs_diff [isize_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.abs_diff [u8_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.abs_diff [u16_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.abs_diff [u32_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.abs_diff [u64_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.abs_diff [u128_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.abs_diff [usize_abs_diff]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.abs_diff [display_error_kind]: https://doc.rust-lang.org/stable/std/io/enum.ErrorKind.html#impl-Display [from_u8_exit_code]: https://doc.rust-lang.org/stable/std/process/struct.ExitCode.html#impl-From%3Cu8%3E [not_never]: https://doc.rust-lang.org/stable/std/primitive.never.html#impl-Not [wrapping_assign_ops]: https://doc.rust-lang.org/stable/std/num/struct.Wrapping.html#trait-implementations [is_aarch64_feature_detected]: https://doc.rust-lang.org/stable/std/arch/macro.is_aarch64_feature_detected.html
1 parent e38447f commit 6df74fe

27 files changed

+273
-264
lines changed

‎lang/rust/Makefile

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# $NetBSD: Makefile,v 1.257 2022/05/24 09:37:43 nia Exp $
1+
# $NetBSD: Makefile,v 1.258 2022/05/25 21:31:26 he Exp $
22

3-
DISTNAME= rustc-1.59.0-src
3+
DISTNAME= rustc-1.60.0-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
55
CATEGORIES= lang
66
MASTER_SITES= https://static.rust-lang.org/dist/
7-
PKGREVISION= 2
87

98
MAINTAINER= [email protected]
109
HOMEPAGE= https://www.rust-lang.org/
@@ -21,6 +20,9 @@ USE_LANGUAGES= c c++11
2120
USE_LIBTOOL= yes
2221
USE_TOOLS+= bash grep gmake perl:build pkg-config
2322

23+
# The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
24+
# build on 7). Mark earlier versions as broken.
25+
BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-*
2426
# Bootstrap is built for NetBSD 9.x on these platforms:
2527
BROKEN_ON_PLATFORM+= NetBSD-8.*-*arm*
2628
BROKEN_ON_PLATFORM+= NetBSD-8.*-aarch64
@@ -67,7 +69,6 @@ MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
6769
MAKE_ENV.Darwin+= MACOSX_DEPLOYMENT_TARGET="10.7"
6870

6971
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
70-
MAKE_ENV.SunOS+= AR=gar
7172

7273
UNLIMIT_RESOURCES+= cputime datasize virtualsize
7374

@@ -79,10 +80,6 @@ CHECK_SSP_SUPPORTED= no
7980

8081
.include "../../mk/bsd.prefs.mk"
8182

82-
.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
83-
BROKEN+= "Bootstrap unavailable for old NetBSD version"
84-
.endif
85-
8683
# Allow overriding MAKE_JOBS_SAFE
8784
# some may chose to mostly build faster,
8885
# and deal with any failures due to deadlocks
@@ -173,55 +170,55 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
173170
DISTFILES:= ${DEFAULT_DISTFILES}
174171

175172
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
176-
RUST_STAGE0_VER= 1.58.1
173+
RUST_STAGE0_VER= 1.59.0
177174
RUST_ARCH:= aarch64-apple-darwin
178175
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
179176
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
180177
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
181178
pre-build-fix:
182179
.endif
183180
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
184-
RUST_STAGE0_VER= 1.58.1
181+
RUST_STAGE0_VER= 1.59.0
185182
RUST_ARCH:= x86_64-apple-darwin
186183
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
187184
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
188185
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
189186
pre-build-fix:
190187
.endif
191188
.if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
192-
RUST_STAGE0_VER= 1.58.1
189+
RUST_STAGE0_VER= 1.59.0
193190
RUST_ARCH:= aarch64-unknown-linux-gnu
194191
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
195192
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
196193
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
197194
pre-build-fix:
198195
.endif
199196
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
200-
RUST_STAGE0_VER= 1.58.1
197+
RUST_STAGE0_VER= 1.59.0
201198
RUST_ARCH:= arm-unknown-linux-gnueabihf
202199
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
203200
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
204201
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
205202
pre-build-fix:
206203
.endif
207204
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
208-
RUST_STAGE0_VER= 1.58.1
205+
RUST_STAGE0_VER= 1.59.0
209206
RUST_ARCH:= armv7-unknown-linux-gnueabihf
210207
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
211208
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
212209
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
213210
pre-build-fix:
214211
.endif
215212
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
216-
RUST_STAGE0_VER= 1.58.1
213+
RUST_STAGE0_VER= 1.59.0
217214
RUST_ARCH:= i686-unknown-linux-gnu
218215
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
219216
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
220217
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
221218
pre-build-fix:
222219
.endif
223220
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
224-
RUST_STAGE0_VER= 1.58.1
221+
RUST_STAGE0_VER= 1.59.0
225222
RUST_ARCH:= x86_64-unknown-linux-gnu
226223
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
227224
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -248,15 +245,15 @@ CONFIGURE_ARGS+= --target=${RUST_ARCH}
248245
pre-build-fix:
249246
.endif
250247
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
251-
RUST_STAGE0_VER= 1.58.1
248+
RUST_STAGE0_VER= 1.59.0
252249
RUST_ARCH:= x86_64-unknown-freebsd
253250
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
254251
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
255252
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
256253
pre-build-fix:
257254
.endif
258255
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
259-
RUST_STAGE0_VER= 1.58.1
256+
RUST_STAGE0_VER= 1.59.0
260257
RUST_ARCH= i586-unknown-netbsd
261258
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
262259
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -274,15 +271,15 @@ pre-build-fix:
274271
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
275272
.endif
276273
.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
277-
RUST_STAGE0_VER= 1.58.1
274+
RUST_STAGE0_VER= 1.59.0
278275
RUST_ARCH= x86_64-unknown-netbsd
279276
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
280277
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
281278
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
282279
pre-build-fix:
283280
.endif
284281
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
285-
RUST_STAGE0_VER= 1.58.1
282+
RUST_STAGE0_VER= 1.59.0
286283
RUST_ARCH= powerpc-unknown-netbsd
287284

288285
# Cross-built against NetBSD 9.0
@@ -295,7 +292,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
295292
. endif
296293

297294
# Cross-built against NetBSD 8.0
298-
. if ${OPSYS_VERSION} < 090000 || make(distinfo) || make(makesum) || make(mdi)
295+
. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
299296
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
300297
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
301298
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -306,7 +303,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
306303
pre-build-fix:
307304
.endif
308305
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
309-
RUST_STAGE0_VER= 1.58.1
306+
RUST_STAGE0_VER= 1.59.0
310307
RUST_ARCH= aarch64-unknown-netbsd
311308
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
312309
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -316,7 +313,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
316313
pre-build-fix:
317314
.endif
318315
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
319-
RUST_STAGE0_VER= 1.58.1
316+
RUST_STAGE0_VER= 1.59.0
320317
RUST_ARCH= aarch64_be-unknown-netbsd
321318
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
322319
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -326,7 +323,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
326323
pre-build-fix:
327324
.endif
328325
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
329-
RUST_STAGE0_VER= 1.58.1
326+
RUST_STAGE0_VER= 1.59.0
330327
RUST_ARCH= sparc64-unknown-netbsd
331328
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
332329
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -337,7 +334,7 @@ pre-build-fix:
337334
.endif
338335
.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
339336
RUST_ARCH= armv7-unknown-netbsd-eabihf
340-
RUST_STAGE0_VER= 1.58.1
337+
RUST_STAGE0_VER= 1.59.0
341338
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
342339
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
343340
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -376,17 +373,14 @@ SUBST_VARS.rpath= PREFIX
376373
# than one substitution entry per file, but are kept separate below to ease
377374
# updating and verification.
378375
#
379-
#CKSUM_CRATES+= vendor/cc
380-
#CKSUMS+= 6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
381-
#CKSUMS+= 1244e301c58e7f693f14ad23b02713cdd38259928a6ca905336891e869e6743e
382376

383-
CKSUM_CRATES+= vendor/libc-0.2.108
384-
CKSUMS+= ddbdc8526a0267ffeb0ab9bb5f01ebb38a14cf759c025b5c0b0ff1178fec889b
385-
CKSUMS+= b8330ddc0af8fa8d57f715eebabf0b0e4bcbef85894eee4a0f7aa0f748c29106
377+
#CKSUM_CRATES+= vendor/cc-1.0.69
378+
#CKSUMS+= dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
379+
#CKSUMS+= 6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
386380

387-
CKSUM_CRATES+= vendor/rustc-ap-rustc_target
388-
CKSUMS+= 673ac3b6875d487ace59b01725d83d2fab4af60615d1f8edd95bf21295947433
389-
CKSUMS+= 5a8bae7d5b6feb07a75226ad061455298f05627086a3b444cb2a1a6272899d88
381+
CKSUM_CRATES+= vendor/libc-0.2.116
382+
CKSUMS+= 5f927d3d26165689b3ae7a7535ea5504068a406ef76705572c610995dbea1f0e
383+
CKSUMS+= a8da54099bdddb92bd0150fd23b90a7d94216927297b7b24bee219e7e1f754e1
390384

391385
CKSUM_CRATES+= vendor/lzma-sys
392386
CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -396,10 +390,6 @@ CKSUM_CRATES+= vendor/stacker
396390
CKSUMS+= cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e
397391
CKSUMS+= 79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
398392

399-
#CKSUM_CRATES+= vendor/libc
400-
#CKSUMS+= 080e0cf03b50874ba9d5082b314eabb0d253532dc4b13d8af095a0c78e0fba84
401-
#CKSUMS+= 1cca4f6c13bdda567d47ec4c83a1ea90d99dbe95b7de9478705b68630a13a8c7
402-
403393
CKSUM_CRATES+= vendor/openssl-src
404394
CKSUMS+= 65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196
405395
CKSUMS+= 7ff3cb1d807d93defda37c2ec01e01223295bcc3d20d218436c07e89cae80fe2
@@ -596,7 +586,7 @@ stage0-bootstrap: install
596586

597587
# rust i386 bootstraps are built for 8.0 and still depend on libstdc++.so.8.
598588
# Pull in compat80 on 9.x and newer.
599-
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) && ${OPSYS_VERSION} >= 090000
589+
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(OS_VERSION:M8.*)
600590
BUILD_DEPENDS+= compat80>=0:../../emulators/compat80
601591
.endif
602592

0 commit comments

Comments
 (0)