Skip to content

Commit daac7c3

Browse files
he32he32
committedSep 24, 2023
rust: Upgrade to version 1.72.0.
Pkgsrc changes: * Adjust patches and cargo checksums to new versions. Upstream changes: Version 1.72.0 (2023-08-24) ========================== Language -------- - [Replace const eval limit by a lint and add an exponential backoff warning] (rust-lang/rust#103877) - [expand: Change how `#![cfg(FALSE)]` behaves on crate root] (rust-lang/rust#110141) - [Stabilize inline asm for LoongArch64] (rust-lang/rust#111235) - [Uplift `clippy::undropped_manually_drops` lint] (rust-lang/rust#111530) - [Uplift `clippy::invalid_utf8_in_unchecked` lint] (rust-lang/rust#111543) - [Uplift `clippy::cast_ref_to_mut` lint] (rust-lang/rust#111567) - [Uplift `clippy::cmp_nan` lint] (rust-lang/rust#111818) - [resolve: Remove artificial import ambiguity errors] (rust-lang/rust#112086) - [Don't require associated types with Self: Sized bounds in `dyn Trait` objects] (rust-lang/rust#112319) Compiler -------- - [Remember names of `cfg`-ed out items to mention them in diagnostics] (rust-lang/rust#109005) - [Support for native WASM exceptions] (rust-lang/rust#111322) - [Add support for NetBSD/aarch64-be (big-endian arm64).] (rust-lang/rust#111326) - [Write to stdout if `-` is given as output file] (rust-lang/rust#111626) - [Force all native libraries to be statically linked when linking a static binary] (rust-lang/rust#111698) - [Add Tier 3 support for `loongarch64-unknown-none*`] (rust-lang/rust#112310) - [Prevent `.eh_frame` from being emitted for `-C panic=abort`] (rust-lang/rust#112403) - [Support 128-bit enum variant in debuginfo codegen] (rust-lang/rust#112474) - [compiler: update solaris/illumos to enable tsan support.] (rust-lang/rust#112039) Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Document memory orderings of `thread::{park, unpark}`] (rust-lang/rust#99587) - [io: soften â<80><98>at most one write attemptâ<80><99> requirement in io::Write::write] (rust-lang/rust#107200) - [Specify behavior of HashSet::insert] (rust-lang/rust#107619) - [Relax implicit `T: Sized` bounds on `BufReader<T>`, `BufWriter<T>` and `LineWriter<T>`] (rust-lang/rust#111074) - [Update runtime guarantee for `select_nth_unstable`] (rust-lang/rust#111974) - [Return `Ok` on kill if process has already exited] (rust-lang/rust#112594) - [Implement PartialOrd for `Vec`s over different allocators] (rust-lang/rust#112632) - [Use 128 bits for TypeId hash] (rust-lang/rust#109953) - [Don't drain-on-drop in DrainFilter impls of various collections.] (rust-lang/rust#104455) - [Make `{Arc,Rc,Weak}::ptr_eq` ignore pointer metadata] (rust-lang/rust#106450) Rustdoc ------- - [Allow whitespace as path separator like double colon] (rust-lang/rust#108537) - [Add search result item types after their name] (rust-lang/rust#110688) - [Search for slices and arrays by type with `[]`] (rust-lang/rust#111958) - [Clean up type unification and "unboxing"] (rust-lang/rust#112233) Stabilized APIs --------------- - [`impl<T: Send> Sync for mpsc::Sender<T>`] (https://doc.rust-lang.org/nightly/std/sync/mpsc/struct.Sender.html#impl-Sync-for-Sender%3CT%3E) - [`impl TryFrom<&OsStr> for &str`] (https://doc.rust-lang.org/nightly/std/primitive.str.html#impl-TryFrom%3C%26'a+OsStr%3E-for-%26'a+str) - [`String::leak`] (https://doc.rust-lang.org/nightly/alloc/string/struct.String.html#method.leak) These APIs are now stable in const contexts: - [`CStr::from_bytes_with_nul`] (https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul) - [`CStr::to_bytes`] (https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul) - [`CStr::to_bytes_with_nul`] (https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul) - [`CStr::to_str`] (https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul) Cargo ----- - Enable `-Zdoctest-in-workspace` by default. When running each documentation test, the working directory is set to the root directory of the package the test belongs to. [docs](https://doc.rust-lang.org/nightly/cargo/commands/cargo-test.html#working-directory-of-tests) [#12221](rust-lang/cargo#12221) [#12288](rust-lang/cargo#12288) - Add support of the "default" keyword to reset previously set `build.jobs` parallelism back to the default. [#12222](rust-lang/cargo#12222) Compatibility Notes ------------------- - [Alter `Display` for `Ipv6Addr` for IPv4-compatible addresses] (rust-lang/rust#112606) - Cargo changed feature name validation check to a hard error. The warning was added in Rust 1.49. These extended characters aren't allowed on crates.io, so this should only impact users of other registries, or people who don't publish to a registry. [#12291](rust-lang/cargo#12291)
1 parent 26a6bdc commit daac7c3

27 files changed

+415
-481
lines changed
 

‎rust/Makefile

+67-49
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# $NetBSD: Makefile,v 1.284 2023/06/19 14:46:47 bsiegert Exp $
22

3-
DISTNAME= rustc-1.71.1-src
3+
DISTNAME= rustc-1.72.0-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
55
CATEGORIES= lang
66
MASTER_SITES= https://static.rust-lang.org/dist/
@@ -212,49 +212,49 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
212212
DISTFILES:= ${DEFAULT_DISTFILES}
213213

214214
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
215-
RUST_STAGE0_VER= 1.70.0
215+
RUST_STAGE0_VER= 1.71.1
216216
RUST_ARCH:= aarch64-apple-darwin
217217
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
218218
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
219219
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
220220
.endif
221221
.if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
222-
RUST_STAGE0_VER= 1.70.0
222+
RUST_STAGE0_VER= 1.71.1
223223
RUST_ARCH:= x86_64-apple-darwin
224224
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
225225
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
226226
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
227227
.endif
228228
.if ${MACHINE_PLATFORM:MLinux-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
229-
RUST_STAGE0_VER= 1.70.0
229+
RUST_STAGE0_VER= 1.71.1
230230
RUST_ARCH:= aarch64-unknown-linux-gnu
231231
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
232232
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
233233
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
234234
.endif
235235
.if ${MACHINE_PLATFORM:MLinux-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
236-
RUST_STAGE0_VER= 1.70.0
236+
RUST_STAGE0_VER= 1.71.1
237237
RUST_ARCH:= arm-unknown-linux-gnueabihf
238238
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
239239
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
240240
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
241241
.endif
242242
.if ${MACHINE_PLATFORM:MLinux-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
243-
RUST_STAGE0_VER= 1.70.0
243+
RUST_STAGE0_VER= 1.71.1
244244
RUST_ARCH:= armv7-unknown-linux-gnueabihf
245245
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
246246
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
247247
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
248248
.endif
249249
.if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make (makesum) || make(mdi)
250-
RUST_STAGE0_VER= 1.70.0
250+
RUST_STAGE0_VER= 1.71.1
251251
RUST_ARCH:= i686-unknown-linux-gnu
252252
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
253253
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
254254
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
255255
.endif
256256
.if ${MACHINE_PLATFORM:MLinux-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
257-
RUST_STAGE0_VER= 1.70.0
257+
RUST_STAGE0_VER= 1.71.1
258258
RUST_ARCH:= x86_64-unknown-linux-gnu
259259
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
260260
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -279,14 +279,14 @@ CONFIGURE_ARGS+= --host=${RUST_ARCH}
279279
CONFIGURE_ARGS+= --target=${RUST_ARCH}
280280
.endif
281281
.if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
282-
RUST_STAGE0_VER= 1.70.0
282+
RUST_STAGE0_VER= 1.71.1
283283
RUST_ARCH:= x86_64-unknown-freebsd
284284
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
285285
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
286286
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
287287
.endif
288288
.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi)
289-
RUST_STAGE0_VER= 1.70.0
289+
RUST_STAGE0_VER= 1.71.1
290290
RUST_ARCH= i586-unknown-netbsd
291291
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
292292
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -306,14 +306,14 @@ pre-build-fix-paxctl:
306306
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
307307
.endif
308308
.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
309-
RUST_STAGE0_VER= 1.70.0
309+
RUST_STAGE0_VER= 1.71.1
310310
RUST_ARCH= x86_64-unknown-netbsd
311311
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
312312
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
313313
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
314314
.endif
315315
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
316-
RUST_STAGE0_VER= 1.70.0
316+
RUST_STAGE0_VER= 1.71.1
317317
RUST_ARCH= powerpc-unknown-netbsd
318318

319319
# Cross-built against NetBSD 9.0
@@ -326,17 +326,17 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
326326
. endif
327327

328328
# Cross-built against NetBSD 8.0
329-
. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
330-
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
331-
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
332-
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
333-
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
334-
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
335-
. endif
329+
#. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
330+
#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
331+
#RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
332+
#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
333+
#SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
334+
#SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
335+
#. endif
336336

337337
.endif
338338
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
339-
RUST_STAGE0_VER= 1.70.0
339+
RUST_STAGE0_VER= 1.71.1
340340
RUST_ARCH= aarch64-unknown-netbsd
341341
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
342342
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -345,7 +345,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
345345
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
346346
.endif
347347
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
348-
RUST_STAGE0_VER= 1.70.0
348+
RUST_STAGE0_VER= 1.71.1
349349
RUST_ARCH= aarch64_be-unknown-netbsd
350350
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
351351
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -354,7 +354,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
354354
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
355355
.endif
356356
.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
357-
RUST_STAGE0_VER= 1.70.0
357+
RUST_STAGE0_VER= 1.71.1
358358
RUST_ARCH= sparc64-unknown-netbsd
359359
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
360360
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -364,7 +364,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
364364
.endif
365365
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
366366
RUST_ARCH= armv7-unknown-netbsd-eabihf
367-
RUST_STAGE0_VER= 1.70.0
367+
RUST_STAGE0_VER= 1.71.1
368368
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
369369
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
370370
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -373,25 +373,25 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
373373
.endif
374374
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
375375
RUST_ARCH= armv6-unknown-netbsd-eabihf
376-
RUST_STAGE0_VER= 1.70.0
377-
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
378-
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
379-
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
380-
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
381-
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
382-
.endif
383-
.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
384-
RUST_ARCH= mipsel-unknown-netbsd
385-
RUST_STAGE0_VER= 1.70.0
376+
RUST_STAGE0_VER= 1.71.1
386377
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
387378
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
388379
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
389380
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
390381
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
391382
.endif
383+
#.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
384+
#RUST_ARCH= mipsel-unknown-netbsd
385+
#RUST_STAGE0_VER= 1.71.1
386+
#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
387+
#RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
388+
#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
389+
#SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
390+
#SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
391+
#.endif
392392
.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
393393
RUST_ARCH= riscv64gc-unknown-netbsd
394-
RUST_STAGE0_VER= 1.70.0
394+
RUST_STAGE0_VER= 1.71.1
395395
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
396396
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
397397
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -434,31 +434,35 @@ CKSUM_CRATES+= vendor/cc-1.0.73
434434
CKSUMS+= 38970d678de0efb4b5e2978265daa8a613a1db35fc42e669621b03fc56d5b138
435435
CKSUMS+= 65de0d6593a4256e5fcaf898f9468d71bab672c70a2dfab3dcb8514e9b72819c
436436

437-
CKSUM_CRATES+= vendor/cc-1.0.77
438-
CKSUMS+= 2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
439-
CKSUMS+= 2b7150f466b9e0617b2c3755450db2090232f27561687d462b0a8ac0518fce87
440-
441437
CKSUM_CRATES+= vendor/cc
442438
CKSUMS+= 17a4659710aa290c4ed9c23063c7b202c5bcf2a84de33aa1f01fc6fded69a1f8
443439
CKSUMS+= a19bcb1a561d4ba5846f8f89fcfe6f05a3cb2e79baf8f21f53f0fba012db1b7f
444440

445441
CKSUM_CRATES+= vendor/libc
446-
CKSUMS+= 247154ad4f5e5114a2bb572bff0d157ed3b937a373759146b7d0f2900203293b
447-
CKSUMS+= a23a255e9793ecf674ddb8cdb5ea9b71999d1bddbaf26bf930e425aa6d2a8bc7
448442
CKSUMS+= 55ce4624745e31ad226b47fde177a46176a89da3fa5030663673a115102471f9
449443
CKSUMS+= 09ab15cd50245f4ced230b7919657ab170e06443bb0ed4baf4449d3472f5f656
444+
CKSUMS+= 90dd33ef20dc3be8aef5bd152a6a06e7ab34f9527b3978487b593aaa16a907bd
445+
CKSUMS+= 6a60a542639528a0a34b9c9a7298973ec2cf1449c59546b7b30dcef6c51874dd
450446

451-
CKSUM_CRATES+= vendor/libc-0.2.139
447+
CKSUM_CRATES+= vendor/libc-0.2.138
452448
CKSUMS+= 107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
453449
CKSUMS+= 4be83bef456569d59405edf134e7fe8eff78f3fe35f1efd60e15405d5c822725
454450

455451
CKSUM_CRATES+= vendor/libc-0.2.140
456452
CKSUMS+= 4493317993af390d8aafc2cb7ace4c349dfc9d2451fd666844f04a4fa1f47442
457453
CKSUMS+= e5414483c02597e67a0aa27db7501f1a98c43ffee0151aa320586dded51f41cb
454+
CKSUMS+= 6442ed05eb390d44a03daa9800af1030f2ee3e61db98675262c227b28de51937
455+
CKSUMS+= ec554c837999c718786debfcfe2241984193751fcd52156323b418d96319aa95
458456

459-
CKSUM_CRATES+= vendor/libc-0.2.143
460-
CKSUMS+= 88e7667202668ca4f7e63b22b56b3d15e78ecc1481d3528ede6ef4728cafa1b4
461-
CKSUMS+= 8f32aab5222247a2afbd7b96c4c48d744a941567d07484fda9fe6a5aae54b75d
457+
CKSUM_CRATES+= vendor/libc-0.2.141
458+
CKSUMS+= 7ef29186aa6ad4745a713d1ecf6d1e29712fc111889dc0c8de38322e82134565
459+
CKSUMS+= 42e8665aa88cd6002c9286060f88fe8b5cfdaff1b569d23292bdb43c8d22a8ff
460+
CKSUMS+= 6442ed05eb390d44a03daa9800af1030f2ee3e61db98675262c227b28de51937
461+
CKSUMS+= ec554c837999c718786debfcfe2241984193751fcd52156323b418d96319aa95
462+
463+
CKSUM_CRATES+= vendor/libc-0.2.146
464+
CKSUMS+= 6442ed05eb390d44a03daa9800af1030f2ee3e61db98675262c227b28de51937
465+
CKSUMS+= ec554c837999c718786debfcfe2241984193751fcd52156323b418d96319aa95
462466

463467
CKSUM_CRATES+= vendor/lzma-sys
464468
CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -469,8 +473,26 @@ CKSUMS+= 59ca847887cf19387119d18c57f08d5a8520d714876ca0142b8f1c001ecde06b
469473
CKSUMS+= 03be8ae293b713fe6e9703e4809dd68caaec992bae6777914ffddae8da2a9bc7
470474

471475
CKSUM_CRATES+= vendor/crossbeam-utils
476+
CKSUMS+= 5f75132808d9e8d6e266fe77f9e20bbc35855a1c37a5dbc0940b3e989bca1a94
477+
CKSUMS+= 3d7c747108434546837b1c5664111c9146fcbfb2e084c95f8ce0be970d652421
478+
479+
CKSUM_CRATES+= vendor/crossbeam-utils-0.8.14
480+
CKSUMS+= 3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
481+
CKSUMS+= eaef167dea04efa811cf0d53de98feac6063ec2196eccd315d345ef86c551aaa
482+
483+
CKSUM_CRATES+= vendor/crossbeam-utils-0.8.15
472484
CKSUMS+= c291992d273abba165579ada7873c34ce4f3674363a7c1ec092be856beac0355
473-
CKSUMS+= 63f1cd23943d58f217afa37a0760ede63d6b51a67e886d3c69819103955d3cb3
485+
CKSUMS+= 4b1060291e306e41b2eaccdeed77625ea229d05442ce063826f59dedc43407ec
486+
487+
CKSUM_CRATES+= vendor/crossbeam-epoch
488+
CKSUMS+= 5f75132808d9e8d6e266fe77f9e20bbc35855a1c37a5dbc0940b3e989bca1a94
489+
CKSUMS+= 3d7c747108434546837b1c5664111c9146fcbfb2e084c95f8ce0be970d652421
490+
491+
CKSUM_CRATES+= vendor/openssl-sys
492+
CKSUMS+= 03f2de4a6d5c4baff39aff416cae0529ab57624e090a48843528242a1c7f20d9
493+
CKSUMS+= a4ec7dac1eb920c609ef4ebf0e0a90af34e4e2a3e6eb3059ed110c029aa1d1cf
494+
CKSUMS+= 1f9233e5993c3537767d39b66fa5a43f5268a9bf89b70884886652cfa7e869c6
495+
CKSUMS+= 93dd56b8ea8c24678cf390232a1de7bbf0de64a5eaa40da95848e22e611c6dcb
474496

475497
CKSUM_CRATES+= vendor/openssl-src
476498
CKSUMS+= 683c9ed1a7953f7f9da43412010de95ba733860a18bc28a4fc3cbcc6ac93c4d7
@@ -482,10 +504,6 @@ CKSUM_CRATES+= vendor/nix
482504
CKSUMS+= c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939
483505
CKSUMS+= 263bd7ace66a4cfee3de18532f61c187327fcbd564666b4f97c4b01ae6885d98
484506

485-
CKSUM_CRATES+= vendor/crossbeam-utils-0.8.14
486-
CKSUMS+= 3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
487-
CKSUMS+= eaef167dea04efa811cf0d53de98feac6063ec2196eccd315d345ef86c551aaa
488-
489507
SUBST_CLASSES+= cksum
490508
SUBST_STAGE.cksum= pre-configure
491509
.for crate in ${CKSUM_CRATES}

‎rust/distinfo

+124-137
Large diffs are not rendered by default.

‎rust/do-cross.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SHORT_TARGETS+= powerpc
1212
SHORT_TARGETS+= arm64
1313
SHORT_TARGETS+= arm64_be
1414
SHORT_TARGETS+= i386
15-
SHORT_TARGETS+= mipsel # produces mips32 (not mips1) executables
15+
#SHORT_TARGETS+= mipsel # produces mips32 (not mips1) executables
1616
SHORT_TARGETS+= riscv64
1717

1818
# Conditional local overrides of ROOT.* variables:

‎rust/patches/patch-compiler_rustc__llvm_build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://github.com/rust-lang/rust/pull/104572
99

1010
--- compiler/rustc_llvm/build.rs.orig 2021-11-01 07:17:29.000000000 +0000
1111
+++ compiler/rustc_llvm/build.rs
12-
@@ -247,10 +247,19 @@ fn main() {
12+
@@ -248,10 +248,19 @@ fn main() {
1313
{
1414
// 32-bit targets need to link libatomic.
1515
println!("cargo:rustc-link-lib=atomic");
@@ -29,7 +29,7 @@ https://github.com/rust-lang/rust/pull/104572
2929
println!("cargo:rustc-link-lib=z");
3030
}
3131
cmd.args(&components);
32-
@@ -337,7 +346,13 @@ fn main() {
32+
@@ -339,7 +348,13 @@ fn main() {
3333
"c++"
3434
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
3535
// NetBSD uses a separate library when relocation is required

‎rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs

-24
This file was deleted.

‎rust/patches/patch-compiler_rustc__target_src_spec_mod.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
$NetBSD$
22

3-
Add i586(pentium), aarch64_be, mipsel and riscv64gc NetBSD targets.
3+
Add i586(pentium) and mipsel NetBSD targets.
44

55
--- compiler/rustc_target/src/spec/mod.rs.orig 2021-03-23 16:15:10.000000000 +0000
66
+++ compiler/rustc_target/src/spec/mod.rs
7-
@@ -1100,10 +1100,14 @@ supported_targets! {
8-
("x86_64-unknown-openbsd", x86_64_unknown_openbsd),
9-
10-
("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
11-
+ ("aarch64_be-unknown-netbsd", aarch64_be_unknown_netbsd),
7+
@@ -1324,6 +1324,8 @@ supported_targets! {
128
("armv6-unknown-netbsd-eabihf", armv6_unknown_netbsd_eabihf),
139
("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
1410
("i686-unknown-netbsd", i686_unknown_netbsd),
1511
+ ("i586-unknown-netbsd", i586_unknown_netbsd),
1612
+ ("mipsel-unknown-netbsd", mipsel_unknown_netbsd),
1713
("powerpc-unknown-netbsd", powerpc_unknown_netbsd),
18-
+ ("riscv64gc-unknown-netbsd", riscv64gc_unknown_netbsd),
14+
("riscv64gc-unknown-netbsd", riscv64gc_unknown_netbsd),
1915
("sparc64-unknown-netbsd", sparc64_unknown_netbsd),
20-
("x86_64-unknown-netbsd", x86_64_unknown_netbsd),
21-

‎rust/patches/patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs

-26
This file was deleted.

‎rust/patches/patch-library_backtrace_src_symbolize_gimli.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
$NetBSD$
22

3-
Add NetBSD to the family who uses dl_iterate_phdr().
3+
Add NetBSD to the family who is in the unix class.
44

55
--- library/backtrace/src/symbolize/gimli.rs.orig 2022-04-04 09:41:26.000000000 +0000
66
+++ library/backtrace/src/symbolize/gimli.rs
7-
@@ -177,6 +177,7 @@ cfg_if::cfg_if! {
8-
target_os = "linux",
9-
target_os = "fuchsia",
10-
target_os = "freebsd",
11-
+ target_os = "netbsd",
12-
target_os = "openbsd",
13-
all(target_os = "android", feature = "dl_iterate_phdr"),
14-
),
7+
@@ -38,6 +38,7 @@ cfg_if::cfg_if! {
8+
target_os = "ios",
9+
target_os = "linux",
10+
target_os = "macos",
11+
+ target_os = "netbsd",
12+
target_os = "openbsd",
13+
target_os = "solaris",
14+
target_os = "illumos",

‎rust/patches/patch-library_core_src_ffi_mod.rs

-20
This file was deleted.

‎rust/patches/patch-library_portable-simd_crates_core__simd_src_swizzle__dyn.rs

-46
This file was deleted.

‎rust/patches/patch-src_bootstrap_bootstrap.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@
1616

1717
# Consider the direct transformation first and then the special cases
1818
if kernel in kerneltype_mapper:
19-
@@ -323,6 +327,7 @@ def default_build_triple(verbose):
20-
cputype_mapper = {
21-
'BePC': 'i686',
22-
'aarch64': 'aarch64',
23-
+ 'aarch64eb': 'aarch64',
24-
'amd64': 'x86_64',
25-
'arm64': 'aarch64',
26-
'i386': 'i686',
27-
@@ -361,10 +366,16 @@ def default_build_triple(verbose):
19+
@@ -362,10 +366,16 @@ def default_build_triple(verbose):
2820
kernel = 'linux-androideabi'
2921
else:
3022
kernel += 'eabihf'

‎rust/patches/patch-src_bootstrap_builder.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ $NetBSD: patch-src_bootstrap_builder.rs,v 1.11 2020/07/06 13:56:32 he Exp $
22

33
Use @PREFIX@, not $ORIGIN in rpath.
44

5-
--- src/bootstrap/builder.rs.orig 2022-12-12 16:02:12.000000000 +0000
5+
--- src/bootstrap/builder.rs.orig 2023-08-23 19:50:10.000000000 +0000
66
+++ src/bootstrap/builder.rs
7-
@@ -1710,7 +1710,7 @@ impl<'a> Builder<'a> {
7+
@@ -1612,7 +1612,7 @@ impl<'a> Builder<'a> {
88
Some("-Wl,-rpath,@loader_path/../lib")
9-
} else if !target.contains("windows") {
9+
} else if !target.contains("windows") && !target.contains("aix") {
1010
rustflags.arg("-Clink-args=-Wl,-z,origin");
1111
- Some("-Wl,-rpath,$ORIGIN/../lib")
1212
+ Some("-Wl,-rpath,@PREFIX@/lib")

‎rust/patches/patch-src_bootstrap_llvm.rs

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
$NetBSD$
22

33
Add NetBSD to the list of riscv's which don't need -latomic.
4+
Try to force use of -latomic on mips* on NetBSD.
45

5-
--- src/bootstrap/llvm.rs.orig 2023-05-31 19:28:10.000000000 +0000
6+
--- src/bootstrap/llvm.rs.orig 2023-08-03 12:13:07.000000000 +0000
67
+++ src/bootstrap/llvm.rs
7-
@@ -379,7 +379,7 @@ impl Step for Llvm {
8-
cfg.define("LLVM_LINK_LLVM_DYLIB", "ON");
8+
@@ -396,6 +396,13 @@ impl Step for Llvm {
9+
ldflags.shared.push(" -latomic");
910
}
1011

11-
- if target.starts_with("riscv") && !target.contains("freebsd") && !target.contains("openbsd")
12-
+ if target.starts_with("riscv") && !target.contains("freebsd") && !target.contains("openbsd") && !target.contains("netbsd")
13-
{
14-
// RISC-V GCC erroneously requires linking against
15-
// `libatomic` when using 1-byte and 2-byte C++
12+
+ if target.starts_with("mips") && target.contains("netbsd")
13+
+ {
14+
+ // try to force this here, should possibly go elsewhere...
15+
+ ldflags.exe.push(" -latomic");
16+
+ ldflags.shared.push(" -latomic");
17+
+ }
18+
+
19+
if target.contains("msvc") {
20+
cfg.define("LLVM_USE_CRT_DEBUG", "MT");
21+
cfg.define("LLVM_USE_CRT_RELEASE", "MT");

‎rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment
55

66
--- src/tools/cargo/src/cargo/core/profiles.rs.orig 2023-07-12 03:33:05.000000000 +0000
77
+++ src/tools/cargo/src/cargo/core/profiles.rs
8-
@@ -683,6 +683,9 @@ impl Profile {
9-
debuginfo: DebugInfo::Explicit(TomlDebugInfo::Full),
8+
@@ -681,6 +681,9 @@ impl Profile {
9+
debuginfo: DebugInfo::Resolved(TomlDebugInfo::Full),
1010
debug_assertions: true,
1111
overflow_checks: true,
1212
+ #[cfg(target_arch = "sparc64")]

‎rust/patches/patch-src_tools_rust-installer_install-template.sh

+107-107
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ should do just fine.
1010

1111
--- src/tools/rust-installer/install-template.sh.orig 2021-05-09 02:52:58.000000000 +0000
1212
+++ src/tools/rust-installer/install-template.sh
13-
@@ -15,20 +15,12 @@ set -u
13+
@@ -6,20 +6,12 @@ set -u
1414
init_logging() {
1515
local _abs_libdir="$1"
1616
local _logfile="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/install.log"
@@ -25,140 +25,140 @@ should do just fine.
2525
local _line="$1"
2626

2727
- if [ -n "${LOGFILE-}" -a -e "${LOGFILE-}" ]; then
28-
- echo "$_line" >> "$LOGFILE"
29-
- # Ignore errors, which may happen e.g. after the manifest dir is deleted
28+
- echo "$_line" >> "$LOGFILE"
29+
- # Ignore errors, which may happen e.g. after the manifest dir is deleted
3030
- fi
3131
}
3232

3333
msg() {
34-
@@ -442,8 +434,8 @@ uninstall_components() {
35-
local _directive
36-
while read _directive; do
34+
@@ -433,8 +425,8 @@ uninstall_components() {
35+
local _directive
36+
while read _directive; do
3737

38-
- local _command=`echo $_directive | cut -f1 -d:`
39-
- local _file=`echo $_directive | cut -f2 -d:`
40-
+ local _command=${_directive%%:*}
41-
+ local _file=${_directive#*:}
38+
- local _command=`echo $_directive | cut -f1 -d:`
39+
- local _file=`echo $_directive | cut -f2 -d:`
40+
+ local _command=${_directive%%:*}
41+
+ local _file=${_directive#*:}
4242

43-
# Sanity checks
44-
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
45-
@@ -549,8 +541,8 @@ install_components() {
46-
local _directive
47-
while read _directive; do
43+
# Sanity checks
44+
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
45+
@@ -541,8 +533,8 @@ install_components() {
46+
local _directive
47+
while read _directive; do
4848

49-
- local _command=`echo $_directive | cut -f1 -d:`
50-
- local _file=`echo $_directive | cut -f2 -d:`
51-
+ local _command=${_directive%%:*}
52-
+ local _file=${_directive#*:}
49+
- local _command=`echo $_directive | cut -f1 -d:`
50+
- local _file=`echo $_directive | cut -f2 -d:`
51+
+ local _command=${_directive%%:*}
52+
+ local _file=${_directive#*:}
5353

54-
# Sanity checks
55-
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
56-
@@ -559,36 +551,24 @@ install_components() {
57-
# Decide the destination of the file
58-
local _file_install_path="$_dest_prefix/$_file"
54+
# Sanity checks
55+
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
56+
@@ -551,36 +543,24 @@ install_components() {
57+
# Decide the destination of the file
58+
local _file_install_path="$_dest_prefix/$_file"
5959

60-
- if echo "$_file" | grep "^etc/" > /dev/null
61-
- then
62-
- local _f="$(echo "$_file" | sed 's/^etc\///')"
63-
- _file_install_path="$CFG_SYSCONFDIR/$_f"
64-
- fi
60+
- if echo "$_file" | grep "^etc/" > /dev/null
61+
- then
62+
- local _f="$(echo "$_file" | sed 's/^etc\///')"
63+
- _file_install_path="$CFG_SYSCONFDIR/$_f"
64+
- fi
6565
-
66-
- if echo "$_file" | grep "^bin/" > /dev/null
67-
- then
68-
- local _f="$(echo "$_file" | sed 's/^bin\///')"
69-
- _file_install_path="$CFG_BINDIR/$_f"
70-
- fi
66+
- if echo "$_file" | grep "^bin/" > /dev/null
67+
- then
68+
- local _f="$(echo "$_file" | sed 's/^bin\///')"
69+
- _file_install_path="$CFG_BINDIR/$_f"
70+
- fi
7171
-
72-
- if echo "$_file" | grep "^lib/" > /dev/null
73-
- then
74-
- local _f="$(echo "$_file" | sed 's/^lib\///')"
75-
- _file_install_path="$CFG_LIBDIR/$_f"
76-
- fi
72+
- if echo "$_file" | grep "^lib/" > /dev/null
73+
- then
74+
- local _f="$(echo "$_file" | sed 's/^lib\///')"
75+
- _file_install_path="$CFG_LIBDIR/$_f"
76+
- fi
7777
-
78-
- if echo "$_file" | grep "^share" > /dev/null
79-
- then
80-
- local _f="$(echo "$_file" | sed 's/^share\///')"
81-
- _file_install_path="$CFG_DATADIR/$_f"
82-
- fi
78+
- if echo "$_file" | grep "^share" > /dev/null
79+
- then
80+
- local _f="$(echo "$_file" | sed 's/^share\///')"
81+
- _file_install_path="$CFG_DATADIR/$_f"
82+
- fi
8383
-
84-
- if echo "$_file" | grep "^share/man/" > /dev/null
85-
- then
86-
- local _f="$(echo "$_file" | sed 's/^share\/man\///')"
87-
- _file_install_path="$CFG_MANDIR/$_f"
88-
- fi
84+
- if echo "$_file" | grep "^share/man/" > /dev/null
85+
- then
86+
- local _f="$(echo "$_file" | sed 's/^share\/man\///')"
87+
- _file_install_path="$CFG_MANDIR/$_f"
88+
- fi
8989
-
90-
+ case "$_file" in
91-
+ etc/*)
92-
+ local _f=${_file#"etc/"}
93-
+ _file_install_path="$CFG_DESTDIR_PREFIX/share/doc/cargo/$_f"
94-
+ ;;
95-
+ bin/*)
96-
+ local _f=${_file#"bin/"}
97-
+ _file_install_path="$CFG_BINDIR/$_f"
98-
+ ;;
99-
+ lib/*)
100-
+ local _f=${_file#"lib/"}
101-
+ _file_install_path="$CFG_LIBDIR/$_f"
102-
+ ;;
103-
+ share/man/*)
104-
+ local _f=${_file#"share/man/"}
105-
+ _file_install_path="$CFG_MANDIR/$_f"
106-
+ ;;
107-
+ share/doc/*)
90+
+ case "$_file" in
91+
+ etc/*)
92+
+ local _f=${_file#"etc/"}
93+
+ _file_install_path="$CFG_DESTDIR_PREFIX/share/doc/cargo/$_f"
94+
+ ;;
95+
+ bin/*)
96+
+ local _f=${_file#"bin/"}
97+
+ _file_install_path="$CFG_BINDIR/$_f"
98+
+ ;;
99+
+ lib/*)
100+
+ local _f=${_file#"lib/"}
101+
+ _file_install_path="$CFG_LIBDIR/$_f"
102+
+ ;;
103+
+ share/man/*)
104+
+ local _f=${_file#"share/man/"}
105+
+ _file_install_path="$CFG_MANDIR/$_f"
106+
+ ;;
107+
+ share/doc/*)
108108
# HACK: Try to support overriding --docdir. Paths with the form
109109
# "share/doc/$product/" can be redirected to a single --docdir
110110
# path. If the following detects that --docdir has been specified
111-
@@ -599,14 +579,17 @@ install_components() {
111+
@@ -591,14 +571,17 @@ install_components() {
112112
# contents of those directories are _not_ disjoint. Since this feature
113113
# is almost entirely to support 'make install' anyway I don't expect
114114
# this problem to be a big deal in practice.
115115
- if [ "$CFG_DOCDIR" != "<default>" ]
116116
- then
117-
- if echo "$_file" | grep "^share/doc/" > /dev/null
118-
- then
119-
- local _f="$(echo "$_file" | sed 's/^share\/doc\/[^/]*\///')"
120-
- _file_install_path="$CFG_DOCDIR/$_f"
121-
- fi
117+
- if echo "$_file" | grep "^share/doc/" > /dev/null
118+
- then
119+
- local _f="$(echo "$_file" | sed 's/^share\/doc\/[^/]*\///')"
120+
- _file_install_path="$CFG_DOCDIR/$_f"
121+
- fi
122122
- fi
123-
+ if [ "$CFG_DOCDIR" != "<default>" ]; then
124-
+ local _f=${_file#"share/doc/"*/}
125-
+ _file_install_path="$CFG_DOCDIR/$_f"
126-
+ fi
127-
+ ;;
128-
+ share/*)
129-
+ local _f=${_file#"share/"}
130-
+ _file_install_path="$CFG_DATADIR/$_f"
131-
+ ;;
132-
+ esac
123+
+ if [ "$CFG_DOCDIR" != "<default>" ]; then
124+
+ local _f=${_file#"share/doc/"*/}
125+
+ _file_install_path="$CFG_DOCDIR/$_f"
126+
+ fi
127+
+ ;;
128+
+ share/*)
129+
+ local _f=${_file#"share/"}
130+
+ _file_install_path="$CFG_DATADIR/$_f"
131+
+ ;;
132+
+ esac
133133
+
134134

135-
# Make sure there's a directory for it
136-
make_dir_recursive "$(dirname "$_file_install_path")"
137-
@@ -625,14 +608,16 @@ install_components() {
135+
# Make sure there's a directory for it
136+
make_dir_recursive "$(dirname "$_file_install_path")"
137+
@@ -617,14 +600,16 @@ install_components() {
138138

139-
maybe_backup_path "$_file_install_path"
139+
maybe_backup_path "$_file_install_path"
140140

141-
- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
142-
- then
143-
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
144-
- run chmod 755 "$_file_install_path"
145-
- else
146-
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
147-
- run chmod 644 "$_file_install_path"
148-
+ local mode=644
149-
+ if test -x "$_src_dir/$_component/$_file"; then
150-
+ mode=755
151-
fi
152-
+ case "$_file" in
153-
+ bin/*) mode=755
154-
+ ;;
155-
+ esac
156-
+ run cp "$_src_dir/$_component/$_file" "$_file_install_path"
157-
+ run chmod $mode "$_file_install_path"
158-
critical_need_ok "file creation failed"
141+
- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
142+
- then
143+
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
144+
- run chmod 755 "$_file_install_path"
145+
- else
146+
+ local mode=644
147+
+ if test -x "$_src_dir/$_component/$_file"; then
148+
+ mode=755
149+
+ fi
150+
+ case "$_file" in
151+
+ bin/*) mode=755
152+
+ ;;
153+
+ esac
154+
run cp "$_src_dir/$_component/$_file" "$_file_install_path"
155+
- run chmod 644 "$_file_install_path"
156+
- fi
157+
+ run chmod $mode "$_file_install_path"
158+
critical_need_ok "file creation failed"
159159

160-
# Update the manifest
161-
@@ -972,7 +957,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
160+
# Update the manifest
161+
@@ -986,7 +971,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
162162
critical_need_ok "failed to write installer version"
163163
164164
# Install the uninstaller

‎rust/patches/patch-vendor_cc-1.0.77_src_lib.rs

-16
This file was deleted.

‎rust/patches/patch-vendor_cc_src_lib.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Add aarch64_eb, mipsel and riscv64 for NetBSD.
44

55
--- vendor/cc/src/lib.rs.orig 2021-07-26 15:20:38.000000000 +0000
66
+++ vendor/cc/src/lib.rs
7-
@@ -1933,6 +1933,9 @@ impl Build {
7+
@@ -1946,6 +1946,9 @@ impl Build {
88
} else if target.contains("freebsd") && arch.starts_with("64") {
99
cmd.args.push(("-march=rv64gc").into());
1010
cmd.args.push("-mabi=lp64d".into());
@@ -38,3 +38,7 @@ Add aarch64_eb, mipsel and riscv64 for NetBSD.
3838
"riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
3939
"riscv32gc-unknown-linux-gnu" => Some("riscv32-linux-gnu"),
4040
"riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
41+
$NetBSD$
42+
43+
--- vendor/cc/src/lib.rs.orig 2023-09-23 21:28:33.348998050 +0000
44+
+++ vendor/cc/src/lib.rs

‎rust/patches/patch-vendor_crossbeam-utils-0.8.15_no__atomic.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
$NetBSD$
2+
3+
Add mipsel-unknown-netbsd target as not having 64-bit atomics.
4+
Unify with crossbeam-utils-0.8.12 by removing mipsel-sony-psx.
5+
6+
--- vendor/crossbeam-utils-0.8.15/no_atomic.rs.orig 2023-08-23 22:08:20.000000000 +0000
7+
+++ vendor/crossbeam-utils-0.8.15/no_atomic.rs
8+
@@ -37,11 +37,11 @@ const NO_ATOMIC_64: &[&str] = &[
9+
"mips-unknown-linux-gnu",
10+
"mips-unknown-linux-musl",
11+
"mips-unknown-linux-uclibc",
12+
- "mipsel-sony-psp",
13+
"mipsel-sony-psx",
14+
"mipsel-unknown-linux-gnu",
15+
"mipsel-unknown-linux-musl",
16+
"mipsel-unknown-linux-uclibc",
17+
+ "mipsel-unknown-netbsd",
18+
"mipsel-unknown-none",
19+
"mipsisa32r6-unknown-linux-gnu",
20+
"mipsisa32r6el-unknown-linux-gnu",

‎rust/patches/patch-vendor_libc-0.2.140_src_unix_solarish_mod.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD$
2+
3+
Fix xattr build.
4+
5+
--- vendor/libc-0.2.140/src/unix/solarish/mod.rs.orig 2023-08-23 22:08:20.000000000 +0000
6+
+++ vendor/libc-0.2.140/src/unix/solarish/mod.rs
7+
@@ -1523,6 +1523,8 @@ pub const EOWNERDEAD: ::c_int = 58;
8+
pub const ENOTRECOVERABLE: ::c_int = 59;
9+
pub const ENOSTR: ::c_int = 60;
10+
pub const ENODATA: ::c_int = 61;
11+
+// This is not supported but is required for xattr
12+
+pub const ENOATTR: ::c_int = ::ENODATA;
13+
pub const ETIME: ::c_int = 62;
14+
pub const ENOSR: ::c_int = 63;
15+
pub const ENONET: ::c_int = 64;

‎rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs renamed to ‎rust/patches/patch-vendor_libc-0.2.141_src_unix_bsd_netbsdlike_netbsd_mips.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ $NetBSD$
22

33
Add file for NetBSD/mips in mips32 variant.
44

5-
--- vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2023-04-23 16:08:32.294600810 +0000
6-
+++ vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mips.rs
5+
--- vendor/libc-0.2.141/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2023-04-23 16:08:32.294600810 +0000
6+
+++ vendor/libc-0.2.141/src/unix/bsd/netbsdlike/netbsd/mips.rs
77
@@ -0,0 +1,22 @@
88
+use PT_FIRSTMACH;
99
+

‎rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs renamed to ‎rust/patches/patch-vendor_libc-0.2.141_src_unix_bsd_netbsdlike_netbsd_mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ $NetBSD$
33
Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips
44
and NetBSD/riscv64.
55

6-
--- vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-04-16 23:32:41.000000000 +0000
7-
+++ vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mod.rs
6+
--- vendor/libc-0.2.141/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-04-16 23:32:41.000000000 +0000
7+
+++ vendor/libc-0.2.141/src/unix/bsd/netbsdlike/netbsd/mod.rs
88
@@ -3049,6 +3049,23 @@ extern "C" {
99
pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
1010
}

‎rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs renamed to ‎rust/patches/patch-vendor_libc-0.2.141_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ $NetBSD$
22

33
Spec for riscv64.
44

5-
--- vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2023-07-02 18:40:59.815126792 +0000
6-
+++ vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/riscv64.rs 2023-07-02 18:38:40.729445691 +0000
5+
--- vendor/libc-0.2.141/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2023-07-02 18:40:59.815126792 +0000
6+
+++ vendor/libc-0.2.141/src/unix/bsd/netbsdlike/netbsd/riscv64.rs 2023-07-02 18:38:40.729445691 +0000
77
@@ -0,0 +1,24 @@
88
+use PT_FIRSTMACH;
99
+

‎rust/patches/patch-vendor_libc-0.2.141_src_unix_solarish_mod.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD$
2+
3+
Fix xattr build.
4+
5+
--- vendor/libc-0.2.141/src/unix/solarish/mod.rs.orig 2023-08-23 22:08:20.000000000 +0000
6+
+++ vendor/libc-0.2.141/src/unix/solarish/mod.rs
7+
@@ -1523,6 +1523,8 @@ pub const EOWNERDEAD: ::c_int = 58;
8+
pub const ENOTRECOVERABLE: ::c_int = 59;
9+
pub const ENOSTR: ::c_int = 60;
10+
pub const ENODATA: ::c_int = 61;
11+
+// This is not supported but is required for xattr
12+
+pub const ENOATTR: ::c_int = ::ENODATA;
13+
pub const ETIME: ::c_int = 62;
14+
pub const ENOSR: ::c_int = 63;
15+
pub const ENONET: ::c_int = 64;

‎rust/patches/patch-vendor_libc-0.2.143_src_unix_bsd_netbsdlike_netbsd_mips.rs renamed to ‎rust/patches/patch-vendor_libc-0.2.146_src_unix_bsd_netbsdlike_netbsd_mips.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ $NetBSD$
22

33
Add support for NetBSD/mipsel (needs mips32).
44

5-
--- vendor/libc-0.2.143/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2023-07-14 09:16:55.357761685 +0000
6-
+++ vendor/libc-0.2.143/src/unix/bsd/netbsdlike/netbsd/mips.rs
5+
--- vendor/libc-0.2.146/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2023-07-14 09:16:55.357761685 +0000
6+
+++ vendor/libc-0.2.146/src/unix/bsd/netbsdlike/netbsd/mips.rs
77
@@ -0,0 +1,22 @@
88
+use PT_FIRSTMACH;
99
+

‎rust/patches/patch-vendor_libc-0.2.143_src_unix_bsd_netbsdlike_netbsd_mod.rs renamed to ‎rust/patches/patch-vendor_libc-0.2.146_src_unix_bsd_netbsdlike_netbsd_mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ $NetBSD$
33
Add support for NetBSD/mipsel and NetBSD/riscv64.
44
Also try to enable backtrace support.
55

6-
--- vendor/libc-0.2.143/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-07-12 05:06:31.000000000 +0000
7-
+++ vendor/libc-0.2.143/src/unix/bsd/netbsdlike/netbsd/mod.rs
6+
--- vendor/libc-0.2.146/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-07-12 05:06:31.000000000 +0000
7+
+++ vendor/libc-0.2.146/src/unix/bsd/netbsdlike/netbsd/mod.rs
88
@@ -3153,6 +3153,22 @@ extern "C" {
99
pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
1010
}

‎rust/patches/patch-vendor_libc-0.2.143_src_unix_bsd_netbsdlike_netbsd_riscv64.rs renamed to ‎rust/patches/patch-vendor_libc-0.2.146_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ $NetBSD$
22

33
Add support for NetBSD/riscv64.
44

5-
--- vendor/libc-0.2.143/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2023-07-14 09:17:03.907579820 +0000
6-
+++ vendor/libc-0.2.143/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
5+
--- vendor/libc-0.2.146/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2023-07-14 09:17:03.907579820 +0000
6+
+++ vendor/libc-0.2.146/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
77
@@ -0,0 +1,22 @@
88
+use PT_FIRSTMACH;
99
+

‎rust/patches/patch-vendor_libc-0.2.146_src_unix_solarish_mod.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD$
2+
3+
Fix xattr build.
4+
5+
--- vendor/libc-0.2.146/src/unix/solarish/mod.rs.orig 2023-08-23 22:08:20.000000000 +0000
6+
+++ vendor/libc-0.2.146/src/unix/solarish/mod.rs
7+
@@ -1523,6 +1523,8 @@ pub const EOWNERDEAD: ::c_int = 58;
8+
pub const ENOTRECOVERABLE: ::c_int = 59;
9+
pub const ENOSTR: ::c_int = 60;
10+
pub const ENODATA: ::c_int = 61;
11+
+// This is not supported but is required for xattr
12+
+pub const ENOATTR: ::c_int = ::ENODATA;
13+
pub const ETIME: ::c_int = 62;
14+
pub const ENOSR: ::c_int = 63;
15+
pub const ENONET: ::c_int = 64;

0 commit comments

Comments
 (0)
Please sign in to comment.