Skip to content

Commit

Permalink
rust: Update to 1.74.1.
Browse files Browse the repository at this point in the history
pkgsrc changes:
 * remove NetBSD-8 support (embedded LLVM requires newer C++
   than what is in -8; it's conceivable that this could still
   build with an external LLVM)
 * undo powerpc 9.0 file naming tweak

Upstream changes:

Version 1.74.1 (2023-12-07)
===========================

- [Resolved spurious STATUS_ACCESS_VIOLATIONs in LLVM]
  (rust-lang/rust#118464)
- [Clarify guarantees for std::mem::discriminant]
  (rust-lang/rust#118006)
- [Fix some subtyping-related regressions]
  (rust-lang/rust#116415)
  • Loading branch information
he32 committed Dec 12, 2023
1 parent e87b3a9 commit 0154372
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 21 deletions.
23 changes: 9 additions & 14 deletions rust174/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-*
BROKEN_ON_PLATFORM+= NetBSD-8.*-*arm*
BROKEN_ON_PLATFORM+= NetBSD-8.*-aarch64
BROKEN_ON_PLATFORM+= NetBSD-8.*-sparc64
BROKEN_ON_PLATFORM+= NetBSD-8.*-powerpc
BROKEN_ON_PLATFORM+= NetBSD-8.*-i386

HAS_CONFIGURE= yes
PYTHON_FOR_BUILD_ONLY= yes
Expand Down Expand Up @@ -77,6 +79,10 @@ MAKE_ENV.Darwin+= MACOSX_DEPLOYMENT_TARGET="10.7"
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
MAKE_ENV.SunOS+= AR=gar

# Debugging of crate resolution
# Annoyingly, this makes the powerpc build succeed...
#MAKE_ENV+= RUSTC_LOG=rustc_metadata

#UNLIMIT_RESOURCES+= cputime stacksize datasize virtualsize
UNLIMIT_RESOURCES+= cputime stacksize datasize

Expand Down Expand Up @@ -315,25 +321,14 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
RUST_STAGE0_VER= 1.73.0
RUST_ARCH= powerpc-unknown-netbsd
RUST_ARCH= powerpc-unknown-netbsd-nb1

# Cross-built against NetBSD 9.0
. if empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
. endif

# Cross-built against NetBSD 8.0
#. if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
#RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
#SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
#SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
#. endif

.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
Expand Down
12 changes: 6 additions & 6 deletions rust174/distinfo
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ Size (rust-1.73.0-i686-unknown-linux-gnu.tar.gz) = 409345618 bytes
BLAKE2s (rust-1.73.0-mipsel-unknown-netbsd.tar.xz) = b670e15ca50ac0c32f0a2222e9a93165331213d1e1afb1380f6d208845e5f16e
SHA512 (rust-1.73.0-mipsel-unknown-netbsd.tar.xz) = 4d7f83a72f5d0056e9cf37dfbdf3ccbb26cec366d483c6a819e9ca84077ef3fec825841b306016f69c9186ad0eedddcf9307c6b6826ef154ab7ff4d4d93ad3d0
Size (rust-1.73.0-mipsel-unknown-netbsd.tar.xz) = 141338300 bytes
BLAKE2s (rust-1.73.0-powerpc-unknown-netbsd90.tar.xz) = 2e03c261b7cbaa1ab81f195399291d0df53ec9120c82a7ce96cceaa697a324ae
SHA512 (rust-1.73.0-powerpc-unknown-netbsd90.tar.xz) = e857295f80702c1381f66b75275a56e76534c466bf1917763f2e813b00064c1dab9a73173e04920c2def7c58a64de45d09f64f0be8b9a4e65037568cec8f104a
Size (rust-1.73.0-powerpc-unknown-netbsd90.tar.xz) = 189810120 bytes
BLAKE2s (rust-1.73.0-powerpc-unknown-netbsd-nb1.tar.xz) = 7cd38d529d47d801f8a38f31d8c9090156102893778bb10796ef088da2c4df3d
SHA512 (rust-1.73.0-powerpc-unknown-netbsd-nb1.tar.xz) = c40f2a7c4ef86c3509da7bc9bf9ee3d6aee23092f2879638fefe8ecc525a1d9957daeb28e8f06a7912717ca0000849ffc214ce94b43a4daadbd0d05eef1585da
Size (rust-1.73.0-powerpc-unknown-netbsd-nb1.tar.xz) = 69744268 bytes
BLAKE2s (rust-1.73.0-riscv64gc-unknown-netbsd.tar.xz) = af73706e14bf3e32a2c068c2bd6b17d0d680c7adb9c3267e5795502259c3adf4
SHA512 (rust-1.73.0-riscv64gc-unknown-netbsd.tar.xz) = cd7549984b77aba25bc1b2456fa97b5b024dc7b0caca3975916468c79bd17d47fab4e69f6d5e3977d1a43bb68ab91b67ea6af386a1e6b681dcd4149487470e88
Size (rust-1.73.0-riscv64gc-unknown-netbsd.tar.xz) = 174529612 bytes
Expand Down Expand Up @@ -90,9 +90,9 @@ Size (rust-std-1.73.0-i686-unknown-linux-gnu.tar.gz) = 41196793 bytes
BLAKE2s (rust-std-1.73.0-mipsel-unknown-netbsd.tar.xz) = f32dc00633140df30d69bd570df72326abef7805f7613e06442919ae33305924
SHA512 (rust-std-1.73.0-mipsel-unknown-netbsd.tar.xz) = d9c7ade1f58fd6fe1de02203da0390c260c4b2ae0e35555276b3cd185605068cf4eccb37095d472f65780dac51c737478adf3695423e7f621fda3a1c24fc5ec7
Size (rust-std-1.73.0-mipsel-unknown-netbsd.tar.xz) = 21409404 bytes
BLAKE2s (rust-std-1.73.0-powerpc-unknown-netbsd90.tar.xz) = a6e4fa0fe55c478e9bc039e8a20a4df4a24f3624e9e4b6aa4d89d732e8f0d4a0
SHA512 (rust-std-1.73.0-powerpc-unknown-netbsd90.tar.xz) = 96d51c772cba4d927da0a502c10ca210585cb9f12e5d5dbba7d8fab2defd0a00d0f852fdc6ce1137e830bb7ca0ebca7622151cb06d9a954a688f79a0659df07d
Size (rust-std-1.73.0-powerpc-unknown-netbsd90.tar.xz) = 21424144 bytes
BLAKE2s (rust-std-1.73.0-powerpc-unknown-netbsd-nb1.tar.xz) = 65e35d4937fbbcc3777c2b2b7eada2779e61635059bff0f41f68d75e88bfc354
SHA512 (rust-std-1.73.0-powerpc-unknown-netbsd-nb1.tar.xz) = 04084a95588593cd84219c8d0d2cd0ebbe199d5d7bf9984967d3fe4266fd98bf540986d3913d0156b032dbcd629776b00cbb605edbf0f52efd3984be7deca612
Size (rust-std-1.73.0-powerpc-unknown-netbsd-nb1.tar.xz) = 21493384 bytes
BLAKE2s (rust-std-1.73.0-riscv64gc-unknown-netbsd.tar.xz) = 0aec9cb78fc43a412767941b1ea2971a84e82cc4c3d0ce7645539a2f5d637ac4
SHA512 (rust-std-1.73.0-riscv64gc-unknown-netbsd.tar.xz) = 9aa659c76e3668a3ea37697c8a0ae9ecdecd619ef12d531d35ec3083b84939ca487cfd567d7bfaeacfd18cee19c1af9fbeb807a41e08863428bb5adf85748ab5
Size (rust-std-1.73.0-riscv64gc-unknown-netbsd.tar.xz) = 21635476 bytes
Expand Down
2 changes: 1 addition & 1 deletion rust174/do-cross.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ TGT.mipsel= mipsel-unknown-netbsd
TGT.riscv64= riscv64gc-unknown-netbsd

# Optional target tweak for bootstrap files
TT.powerpc= powerpc-unknown-netbsd90
#TT.powerpc= powerpc-unknown-netbsd90

WRKDIR= ${.CURDIR}/work
SCRIPTS= ${WRKDIR}/scripts
Expand Down

0 comments on commit 0154372

Please sign in to comment.