Sun Sep 4 09:57:13 2022 UTC ()
rust-bin: reduce repetition in NetBSD section, fix aarch64eb entry.

Thanks to pkglint for the need to fix aarch64eb.


(he)
diff -r1.39 -r1.40 pkgsrc/lang/rust-bin/Makefile
cvs diff -r1.39 -r1.40 pkgsrc/lang/rust-bin/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust-bin/Makefile 2022/09/04 06:58:57 1.39
+++ pkgsrc/lang/rust-bin/Makefile 2022/09/04 09:57:13 1.40
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.39 2022/09/04 06:58:57 he Exp $ 1# $NetBSD: Makefile,v 1.40 2022/09/04 09:57:13 he Exp $
2 2
3DISTNAME= rust-1.62.1 3DISTNAME= rust-1.62.1
4PKGNAME= ${DISTNAME:S/rust/rust-bin/1} 4PKGNAME= ${DISTNAME:S/rust/rust-bin/1}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= https://static.rust-lang.org/dist/ 6MASTER_SITES= https://static.rust-lang.org/dist/
7DIST_SUBDIR= ${PKGNAME_NOREV} 7DIST_SUBDIR= ${PKGNAME_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://rust-lang.org/ 10HOMEPAGE= https://rust-lang.org/
11COMMENT= Safe, concurrent, practical language (pre-built distribution) 11COMMENT= Safe, concurrent, practical language (pre-built distribution)
12LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
13 13
14CONFLICTS+= rust-[0-9]* 14CONFLICTS+= rust-[0-9]*
15 15
16# Rust upstream provided binaries 16# Rust upstream provided binaries
17ONLY_FOR_PLATFORM+= Darwin-*-x86_64 17ONLY_FOR_PLATFORM+= Darwin-*-x86_64
18ONLY_FOR_PLATFORM+= FreeBSD-*-x86_64 18ONLY_FOR_PLATFORM+= FreeBSD-*-x86_64
19ONLY_FOR_PLATFORM+= NetBSD-*-x86_64 19ONLY_FOR_PLATFORM+= NetBSD-*-x86_64
20ONLY_FOR_PLATFORM+= Linux-*-aarch64 20ONLY_FOR_PLATFORM+= Linux-*-aarch64
21ONLY_FOR_PLATFORM+= Linux-*-i386 21ONLY_FOR_PLATFORM+= Linux-*-i386
22ONLY_FOR_PLATFORM+= Linux-*-x86_64 22ONLY_FOR_PLATFORM+= Linux-*-x86_64
23 23
24# he@NetBSD.org provided binaries 24# he@NetBSD.org provided binaries
25ONLY_FOR_PLATFORM+= NetBSD-*-aarch64 25ONLY_FOR_PLATFORM+= NetBSD-*-aarch64
 26ONLY_FOR_PLATFORM+= NetBSD-*-aarch64eb
26ONLY_FOR_PLATFORM+= NetBSD-*-earmv7hf 27ONLY_FOR_PLATFORM+= NetBSD-*-earmv7hf
27ONLY_FOR_PLATFORM+= NetBSD-*-i386 28ONLY_FOR_PLATFORM+= NetBSD-*-i386
28ONLY_FOR_PLATFORM+= NetBSD-*-powerpc 29ONLY_FOR_PLATFORM+= NetBSD-*-powerpc
29ONLY_FOR_PLATFORM+= NetBSD-*-sparc64 30ONLY_FOR_PLATFORM+= NetBSD-*-sparc64
30 31
31NETBSD_REPO= https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/ 32NETBSD_REPO= https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
32 33
33CHECK_RELRO_SKIP+= lib/rustlib/*/bin/* 34CHECK_RELRO_SKIP+= lib/rustlib/*/bin/*
34 35
35# Bootstraps built for 9.0. 36# Bootstraps built for 9.0.
36BROKEN_ON_PLATFORM+= NetBSD-8.*-earmv7hf 37BROKEN_ON_PLATFORM+= NetBSD-8.*-earmv7hf
37 38
38# Binary distributions aren't built as PIE. 39# Binary distributions aren't built as PIE.
@@ -88,71 +89,78 @@ DISTFILES:= ${DISTFILES} ${DISTNAME}-${R @@ -88,71 +89,78 @@ DISTFILES:= ${DISTFILES} ${DISTNAME}-${R
88.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi) 89.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
89RUST_ARCH:= x86_64-unknown-netbsd 90RUST_ARCH:= x86_64-unknown-netbsd
90DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz 91DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
91.endif 92.endif
92 93
93# NetBSD provided binaries: 94# NetBSD provided binaries:
94 95
95NBSUF= 96NBSUF=
96 97
97.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi) 98.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi)
98RUST_ARCH:= aarch64-unknown-netbsd 99RUST_ARCH:= aarch64-unknown-netbsd
99DN:= ${DISTNAME}${NBSUF} 100DN:= ${DISTNAME}${NBSUF}
100EXTRACT_SUFX= .tar.xz 101EXTRACT_SUFX= .tar.xz
101DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 102DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
102SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 103DISTFILES:= ${DISTFILES} ${DF}
 104SITES.${DF}= ${NETBSD_REPO}
103.endif 105.endif
104.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64_be) || make(distinfo) || make(makesum) || make(mdi) 106.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make(makesum) || make(mdi)
105RUST_ARCH:= aarch64_be-unknown-netbsd 107RUST_ARCH:= aarch64_be-unknown-netbsd
106DN:= ${DISTNAME}${NBSUF} 108DN:= ${DISTNAME}${NBSUF}
107EXTRACT_SUFX= .tar.xz 109EXTRACT_SUFX= .tar.xz
108DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 110DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
109SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 111DISTFILES:= ${DISTFILES} ${DF}
 112SITES.${DF}= ${NETBSD_REPO}
110.endif 113.endif
111.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi) 114.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi)
112RUST_ARCH:= armv7-unknown-netbsd-eabihf 115RUST_ARCH:= armv7-unknown-netbsd-eabihf
113DN:= ${DISTNAME}${NBSUF} 116DN:= ${DISTNAME}${NBSUF}
114EXTRACT_SUFX= .tar.xz 117EXTRACT_SUFX= .tar.xz
115DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 118DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
116SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 119DISTFILES:= ${DISTFILES} ${DF}
 120SITES.${DF}= ${NETBSD_REPO}
117.endif 121.endif
118.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi) 122.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi)
119RUST_ARCH:= i586-unknown-netbsd 123RUST_ARCH:= i586-unknown-netbsd
120DN:= ${DISTNAME}${NBSUF} 124DN:= ${DISTNAME}${NBSUF}
121EXTRACT_SUFX= .tar.xz 125EXTRACT_SUFX= .tar.xz
122DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 126DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
123SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 127DISTFILES:= ${DISTFILES} ${DF}
 128SITES.${DF}= ${NETBSD_REPO}
124.endif 129.endif
125.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi) 130.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi)
126. if ${OPSYS_VERSION} >= 090000 131. if ${OPSYS_VERSION} >= 090000
127RUST_ARCH:= powerpc-unknown-netbsd90 132RUST_ARCH:= powerpc-unknown-netbsd90
128DN:= ${DISTNAME}${NBSUF} 133DN:= ${DISTNAME}${NBSUF}
129EXTRACT_SUFX= .tar.xz 134EXTRACT_SUFX= .tar.xz
130DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 135DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
131SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 136DISTFILES:= ${DISTFILES} ${DF}
 137SITES.${DF}= ${NETBSD_REPO}
132. else 138. else
133RUST_ARCH:= powerpc-unknown-netbsd 139RUST_ARCH:= powerpc-unknown-netbsd
134DN:= ${DISTNAME}${NBSUF} 140DN:= ${DISTNAME}${NBSUF}
135EXTRACT_SUFX= .tar.xz 141EXTRACT_SUFX= .tar.xz
136DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 142DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
137SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 143DISTFILES:= ${DISTFILES} ${DF}
 144SITES.${DF}= ${NETBSD_REPO}
138. endif 145. endif
139.endif 146.endif
140.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi) 147.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi)
141RUST_ARCH:= sparc64-unknown-netbsd 148RUST_ARCH:= sparc64-unknown-netbsd
142DN:= ${DISTNAME}${NBSUF} 149DN:= ${DISTNAME}${NBSUF}
143EXTRACT_SUFX= .tar.xz 150EXTRACT_SUFX= .tar.xz
144DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}${EXTRACT_SUFX} 151DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
145SITES.${DN}-${RUST_ARCH}${EXTRACT_SUFX}= ${NETBSD_REPO} 152DISTFILES:= ${DISTFILES} ${DF}
 153SITES.${DF}= ${NETBSD_REPO}
146.endif 154.endif
147 155
148# Binary still extracts to plain non-nb'ed directory 156# Binary still extracts to plain non-nb'ed directory
149WRKSRC:= ${WRKSRC:C/nb[0-9]*//} 157WRKSRC:= ${WRKSRC:C/nb[0-9]*//}
150 158
151do-install: 159do-install:
152 cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC} 160 cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC}
153 cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \ 161 cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \
154 --destdir=${DESTDIR} --prefix=${PREFIX} 162 --destdir=${DESTDIR} --prefix=${PREFIX}
155 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp 163 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp
156 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log 164 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log
157 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/manifest-* 165 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/manifest-*
158 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh 166 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh