rust178-bin: use the new armv7 binary with non-TlS usage.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sun Aug 4 14:52:30 2024 +0000
Changeset:	263858346218c049232caff2194bf1947ff766bd

Modified Files:
	rust178-bin/Makefile
	rust178-bin/distinfo

Log Message:
rust178-bin: use the new armv7 binary with non-TlS usage.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=263858346218c049232caff2194bf1947ff766bd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust178-bin/Makefile | 6 ++++--
 rust178-bin/distinfo | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs:
diff --git a/rust178-bin/Makefile b/rust178-bin/Makefile
index 51469fbc29..2b64dc3454 100644
--- a/rust178-bin/Makefile
+++ b/rust178-bin/Makefile
@@ -112,7 +112,7 @@ NBSUF=
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi)
 # Just for aarch64, due to workaround for PR#58154
-NB=		-nb1
+NB:=		-nb1
 RUST_ARCH:=	aarch64-unknown-netbsd
 DN:=		${DISTNAME}${NBSUF}
 EXTRACT_SUFX=	.tar.xz
@@ -137,10 +137,11 @@ DISTFILES:=	${DISTFILES} ${DF}
 SITES.${DF}=	${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi)
+NB:=		-nb1
 RUST_ARCH:=	armv7-unknown-netbsd-eabihf
 DN:=		${DISTNAME}${NBSUF}
 EXTRACT_SUFX=	.tar.xz
-DF:=		${DN}-${RUST_ARCH}${EXTRACT_SUFX}
+DF:=		${DN}-${RUST_ARCH}${NB}${EXTRACT_SUFX}
 DISTFILES:=	${DISTFILES} ${DF}
 SITES.${DF}=	${NETBSD_REPO}
 .endif
@@ -199,6 +200,7 @@ SITES.${DF}=	${NETBSD_REPO}
 
 # Binary still extracts to plain non-nb'ed directory
 WRKSRC:=	${WRKSRC:C/nb[0-9]*//}
+WRKSRC:=	${WRKSRC:C/-$//}
 # Undo the powerpc netbsd90 thingie...
 WRKSRC:=	${WRKSRC:C/netbsd90/netbsd/}
 
diff --git a/rust178-bin/distinfo b/rust178-bin/distinfo
index 17e115d934..a200627a28 100644
--- a/rust178-bin/distinfo
+++ b/rust178-bin/distinfo
@@ -15,9 +15,9 @@ Size (rust-bin-1.78.0/rust-1.78.0-aarch64-unknown-netbsd-nb1.tar.xz) = 170867824
 BLAKE2s (rust-bin-1.78.0/rust-1.78.0-armv6-unknown-netbsd-eabihf.tar.xz) = 16aa3fb01f417c2b4752928934aa95680b444360ef0262b75a1c627f38347e0f
 SHA512 (rust-bin-1.78.0/rust-1.78.0-armv6-unknown-netbsd-eabihf.tar.xz) = 78f426b28d32bd5c4a54e6094f016de292fe49bdb190bfb12c68e16e8b82b6e8b497ede77f42409d93d26528f506672f9592f0037d51e2ff946c368e9b661f61
 Size (rust-bin-1.78.0/rust-1.78.0-armv6-unknown-netbsd-eabihf.tar.xz) = 145977172 bytes
-BLAKE2s (rust-bin-1.78.0/rust-1.78.0-armv7-unknown-netbsd-eabihf.tar.xz) = 9142653078521044a8eb33647ac4d91995043e4402326675f9ac42a03d812075
-SHA512 (rust-bin-1.78.0/rust-1.78.0-armv7-unknown-netbsd-eabihf.tar.xz) = e32b9493b6a7ae4a086e665696f33a67e1aa1f2760fb91388e31d317886b9a1975139d3c9f33eb3fd39df22e16cdade159e2fccc1477e73afd600632e3a978a8
-Size (rust-bin-1.78.0/rust-1.78.0-armv7-unknown-netbsd-eabihf.tar.xz) = 146942980 bytes
+BLAKE2s (rust-bin-1.78.0/rust-1.78.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = ea5bfa6aecf7f964e909f656f1d1c5595e0414a4d677cd82d3b47e0d4306c503
+SHA512 (rust-bin-1.78.0/rust-1.78.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = a0e3a4a8e596ce78760a1557b1d383d5e2152c19d4ee7befdce4779b5925e52a94fd0c8803b32ce6f36e2955c4fe0f2e4689ff8cad095f1d073a5aae7121ee52
+Size (rust-bin-1.78.0/rust-1.78.0-armv7-unknown-netbsd-eabihf-nb1.tar.xz) = 146930824 bytes
 BLAKE2s (rust-bin-1.78.0/rust-1.78.0-i586-unknown-netbsd.tar.xz) = bd0f22313590a0123e98418c004a2d86a479aacbfd1052d1c8209d44cb9ef795
 SHA512 (rust-bin-1.78.0/rust-1.78.0-i586-unknown-netbsd.tar.xz) = 6ac915c8f57e7e6ebe7e723250cee9a9687612d7222560afbb78aded33e76af9be10da3daaede413bf6d9b64b5ceb84ae9ec5e612077524ee9263ecde76eaa44
 Size (rust-bin-1.78.0/rust-1.78.0-i586-unknown-netbsd.tar.xz) = 184825112 bytes