Thu Jul 15 11:29:20 2021 UTC ()
Pullup ticket #6487 - requested by he
lang/rust-bin: build fix

Revisions pulled up:
- lang/rust-bin/Makefile                                        1.24

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Jul 11 22:25:10 UTC 2021

   Modified Files:
   	pkgsrc/lang/rust-bin: Makefile

   Log Message:
   Correct the names for the NetBSD versions to use.

   This uses the faster "install.sh" script, and also omits the
   "rust-doc" subset, for a much faster installation.

   This is a temporary hack for this version, will be removed on
   the next go-around.

   Apologies for this going un-committed, only myself to blame.
   Should fix part of PR#56304.


(bsiegert)
diff -r1.23 -r1.23.2.1 pkgsrc/lang/rust-bin/Makefile
cvs diff -r1.23 -r1.23.2.1 pkgsrc/lang/rust-bin/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust-bin/Makefile 2021/06/13 12:25:02 1.23
+++ pkgsrc/lang/rust-bin/Makefile 2021/07/15 11:29:20 1.23.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2021/06/13 12:25:02 he Exp $ 1# $NetBSD: Makefile,v 1.23.2.1 2021/07/15 11:29:20 bsiegert Exp $
2 2
3DISTNAME= rust-1.52.1 3DISTNAME= rust-1.52.1
4PKGNAME= ${DISTNAME:S/rust/rust-bin/1} 4PKGNAME= ${DISTNAME:S/rust/rust-bin/1}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://static.rust-lang.org/dist/ 7MASTER_SITES= https://static.rust-lang.org/dist/
8DIST_SUBDIR= ${PKGNAME_NOREV} 8DIST_SUBDIR= ${PKGNAME_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://rust-lang.org/ 11HOMEPAGE= https://rust-lang.org/
12COMMENT= Safe, concurrent, practical language (pre-built distribution) 12COMMENT= Safe, concurrent, practical language (pre-built distribution)
13LICENSE= mit OR apache-2.0 13LICENSE= mit OR apache-2.0
14 14
@@ -80,64 +80,67 @@ RUST_ARCH:= x86_64-unknown-linux-gnu @@ -80,64 +80,67 @@ RUST_ARCH:= x86_64-unknown-linux-gnu
80DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz 80DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
81.endif 81.endif
82.if (!empty(MACHINE_PLATFORM:MLinux-*-x86_64) && empty(GLIBC_VERSION)) || make(distinfo) || make(makesum) || make(mdi) 82.if (!empty(MACHINE_PLATFORM:MLinux-*-x86_64) && empty(GLIBC_VERSION)) || make(distinfo) || make(makesum) || make(mdi)
83RUST_ARCH:= x86_64-unknown-linux-musl 83RUST_ARCH:= x86_64-unknown-linux-musl
84DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz 84DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
85.endif 85.endif
86.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi) 86.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
87RUST_ARCH:= x86_64-unknown-netbsd 87RUST_ARCH:= x86_64-unknown-netbsd
88DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz 88DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
89.endif 89.endif
90 90
91# NetBSD provided binaries: 91# NetBSD provided binaries:
92 92
 93# Suffix for re-generated binary bootstrap
 94NBSUF=nb1
 95
93.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi) 96.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi)
94RUST_ARCH:= aarch64-unknown-netbsd 97RUST_ARCH:= aarch64-unknown-netbsd
95DN:= ${DISTNAME}nb${PKGREVISION} 98DN:= ${DISTNAME}${NBSUF}
96DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz 99DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
97SITES.${DN}-${RUST_ARCH}.tar.gz= \ 100SITES.${DN}-${RUST_ARCH}.tar.gz= \
98 ${NETBSD_REPO} 101 ${NETBSD_REPO}
99.endif 102.endif
100.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi) 103.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi)
101RUST_ARCH:= armv7-unknown-netbsd-eabihf 104RUST_ARCH:= armv7-unknown-netbsd-eabihf
102DN:= ${DISTNAME}nb${PKGREVISION} 105DN:= ${DISTNAME}${NBSUF}
103DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz 106DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
104SITES.${DN}-${RUST_ARCH}.tar.gz= \ 107SITES.${DN}-${RUST_ARCH}.tar.gz= \
105 ${NETBSD_REPO} 108 ${NETBSD_REPO}
106.endif 109.endif
107.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi) 110.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi)
108RUST_ARCH:= i586-unknown-netbsd 111RUST_ARCH:= i586-unknown-netbsd
109DN:= ${DISTNAME}nb${PKGREVISION} 112DN:= ${DISTNAME}${NBSUF}
110DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz 113DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
111SITES.${DN}-${RUST_ARCH}.tar.gz= \ 114SITES.${DN}-${RUST_ARCH}.tar.gz= \
112 ${NETBSD_REPO} 115 ${NETBSD_REPO}
113.endif 116.endif
114.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi) 117.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi)
115RUST_ARCH:= powerpc-unknown-netbsd90 118RUST_ARCH:= powerpc-unknown-netbsd90
116DN:= ${DISTNAME}nb${PKGREVISION} 119DN:= ${DISTNAME}${NBSUF}
117DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz 120DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
118SITES.${DN}-${RUST_ARCH}.tar.gz= \ 121SITES.${DN}-${RUST_ARCH}.tar.gz= \
119 ${NETBSD_REPO} 122 ${NETBSD_REPO}
120. if !empty(OS_VERSION:M8.*) 123. if !empty(OS_VERSION:M8.*)
121RUST_ARCH:= powerpc-unknown-netbsd 124RUST_ARCH:= powerpc-unknown-netbsd
122DN:= ${DISTNAME}nb${PKGREVISION} 125DN:= ${DISTNAME}${NBSUF}
123DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz 126DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
124SITES.${DN}-${RUST_ARCH}.tar.gz= \ 127SITES.${DN}-${RUST_ARCH}.tar.gz= \
125 ${NETBSD_REPO} 128 ${NETBSD_REPO}
126. endif 129. endif
127.endif 130.endif
128.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi) 131.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi)
129RUST_ARCH:= sparc64-unknown-netbsd 132RUST_ARCH:= sparc64-unknown-netbsd
130DN:= ${DISTNAME}nb${PKGREVISION} 133DN:= ${DISTNAME}${NBSUF}
131DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz 134DISTFILES:= ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
132SITES.${DN}-${RUST_ARCH}.tar.gz= \ 135SITES.${DN}-${RUST_ARCH}.tar.gz= \
133 ${NETBSD_REPO} 136 ${NETBSD_REPO}
134.endif 137.endif
135 138
136# Binary still extracts to plain non-nb'ed directory 139# Binary still extracts to plain non-nb'ed directory
137WRKSRC:= ${WRKSRC:C/nb[0-9]*//} 140WRKSRC:= ${WRKSRC:C/nb[0-9]*//}
138 141
139do-install: 142do-install:
140 cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC} 143 cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC}
141 cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \ 144 cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \
142 --destdir=${DESTDIR} --prefix=${PREFIX} 145 --destdir=${DESTDIR} --prefix=${PREFIX}
143 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp 146 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp