1- # $NetBSD: Makefile,v 1.237 2021/05/24 19:52:35 wiz Exp $
1+ # $NetBSD: Makefile,v 1.238 2021/05/26 09:21:39 he Exp $
22
3- DISTNAME = rustc-1.50 .0-src
3+ DISTNAME = rustc-1.51 .0-src
44PKGNAME = ${DISTNAME:S/rustc/rust/:S/-src//}
5- PKGREVISION = 3
65CATEGORIES = lang
76MASTER_SITES = https://static.rust-lang.org/dist/
87
@@ -19,7 +18,7 @@ GCC_REQD+= 5
1918USE_GCC_RUNTIME = yes
2019USE_LANGUAGES = c c++11
2120USE_LIBTOOL = yes
22- USE_TOOLS+ = bash ggrep gmake perl:build pkg-config
21+ USE_TOOLS+ = bash grep gmake perl:build pkg-config
2322
2423# The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
2524# build on 7). Mark earlier versions as broken.
@@ -46,20 +45,6 @@ CONFIGURE_ARGS+= --disable-dist-src
4645CONFIGURE_ARGS+ = --disable-llvm-static-stdcpp
4746CONFIGURE_ARGS+ = --disable-ninja
4847
49- # Include (optional) settings to cross-build rust
50- .include "cross.mk"
51-
52- .if !empty(rust.BUILD_TARGET)
53- BUILD_TARGET = ${rust.BUILD_TARGET}
54- .endif
55-
56- .if !empty(TARGET)
57- # Use "dist" build target for cross compile of bootstrap
58- BUILD_TARGET? = dist
59- .else
60- BUILD_TARGET? = build
61- .endif
62-
6348# Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
6449# uncommenting the LD_LIBRARY_PATH setting may be required to run
6550# the bootstrap
@@ -84,6 +69,35 @@ CHECK_SSP_SUPPORTED= no
8469
8570.include "../../mk/bsd.prefs.mk"
8671
72+ # Allow overriding MAKE_JOBS_SAFE
73+ # some may chose to mostly build faster,
74+ # and deal with any failures due to deadlocks
75+ .if !empty(rust.MAKE_JOBS_SAFE)
76+ . if ${rust.MAKE_JOBS_SAFE :tl} == "yes"
77+ MAKE_JOBS_SAFE = yes
78+ . endif
79+ .endif
80+
81+ .if !empty(rust.BUILD_TARGET)
82+ BUILD_TARGET = ${rust.BUILD_TARGET}
83+ .endif
84+
85+ # Include (optional) settings to cross-build rust
86+ .include "cross.mk"
87+
88+ .if !empty(TARGET)
89+ # Use "dist" build target for cross compile of bootstrap
90+ BUILD_TARGET? = dist
91+ .else
92+ BUILD_TARGET? = build
93+ .endif
94+
95+ .if ${BUILD_TARGET} == "dist"
96+ # Reduce size of bootstrap:
97+ CONFIGURE_ARGS+ = --disable-docs
98+ CONFIGURE_ARGS+ = --disable-compiler-docs
99+ .endif
100+
87101.if !empty(MACHINE_PLATFORM :MNetBSD-* -powerpc) || \
88102 !empty(MACHINE_PLATFORM :MNetBSD-* -earmv7hf) || \
89103 !empty(TARGET :Marmv7-unknown-netbsd-eabihf)
@@ -135,7 +149,7 @@ CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
135149# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
136150# \todo Consider avoiding setting this on netbsd-9 past the fix.
137151. if ${MACHINE_PLATFORM :MNetBSD-[1-9].* } && !${MACHINE_PLATFORM:MNetBSD-9.99.* }
138- MAKE_JOBS_SAFE = no
152+ MAKE_JOBS_SAFE? = no
139153. endif
140154
141155# Open PRs
@@ -161,55 +175,55 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
161175DISTFILES: = ${DEFAULT_DISTFILES}
162176
163177.if !empty(MACHINE_PLATFORM :MDarwin-* -aarch64) || make(distinfo) || make (makesum) || make(mdi)
164- RUST_STAGE0_VER = 1.49 .0
178+ RUST_STAGE0_VER = 1.50 .0
165179RUST_ARCH: = aarch64-apple-darwin
166180RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
167181RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
168182DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
169183pre-build-fix :
170184.endif
171185.if !empty(MACHINE_PLATFORM :MDarwin-* -x86_64) || make(distinfo) || make (makesum) || make(mdi)
172- RUST_STAGE0_VER = 1.49 .0
186+ RUST_STAGE0_VER = 1.50 .0
173187RUST_ARCH: = x86_64-apple-darwin
174188RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
175189RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
176190DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
177191pre-build-fix :
178192.endif
179193.if !empty(MACHINE_PLATFORM :MLinux-* -aarch64) || make(distinfo) || make (makesum) || make(mdi)
180- RUST_STAGE0_VER = 1.49 .0
194+ RUST_STAGE0_VER = 1.50 .0
181195RUST_ARCH: = aarch64-unknown-linux-gnu
182196RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
183197RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
184198DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
185199pre-build-fix :
186200.endif
187201.if !empty(MACHINE_PLATFORM :MLinux-* -earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
188- RUST_STAGE0_VER = 1.49 .0
202+ RUST_STAGE0_VER = 1.50 .0
189203RUST_ARCH: = arm-unknown-linux-gnueabihf
190204RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
191205RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
192206DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
193207pre-build-fix :
194208.endif
195209.if !empty(MACHINE_PLATFORM :MLinux-* -earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
196- RUST_STAGE0_VER = 1.49 .0
210+ RUST_STAGE0_VER = 1.50 .0
197211RUST_ARCH: = armv7-unknown-linux-gnueabihf
198212RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
199213RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
200214DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
201215pre-build-fix :
202216.endif
203217.if !empty(MACHINE_PLATFORM :MLinux-* -i386) || make(distinfo) || make (makesum) || make(mdi)
204- RUST_STAGE0_VER = 1.49 .0
218+ RUST_STAGE0_VER = 1.50 .0
205219RUST_ARCH: = i686-unknown-linux-gnu
206220RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
207221RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
208222DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
209223pre-build-fix :
210224.endif
211225.if !empty(MACHINE_PLATFORM :MLinux-* -x86_64) || make(distinfo) || make (makesum) || make(mdi)
212- RUST_STAGE0_VER = 1.49 .0
226+ RUST_STAGE0_VER = 1.50 .0
213227RUST_ARCH: = x86_64-unknown-linux-gnu
214228RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
215229RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -222,7 +236,7 @@ pre-build-fix:
222236# x86_64-sun-solaris bootstrap and comment out the overrides.
223237#
224238.if !empty(MACHINE_PLATFORM :MSunOS-* -x86_64) || make(distinfo) || make (makesum) || make(mdi)
225- RUST_STAGE0_VER = 1.49 .0
239+ RUST_STAGE0_VER = 1.50 .0
226240RUST_ARCH: = x86_64-unknown-illumos
227241RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
228242SITES.${RUST_STAGE0} = https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -236,16 +250,16 @@ CONFIGURE_ARGS+= --target=${RUST_ARCH}
236250pre-build-fix :
237251.endif
238252.if !empty(MACHINE_PLATFORM :MFreeBSD-* -x86_64) || make(distinfo) || make (makesum) || make(mdi)
239- RUST_STAGE0_VER = 1.49 .0
253+ RUST_STAGE0_VER = 1.50 .0
240254RUST_ARCH: = x86_64-unknown-freebsd
241255RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
242256RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
243257DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
244258pre-build-fix :
245259.endif
246260.if !empty(MACHINE_PLATFORM :MNetBSD-* -i386) || make(distinfo) || make (makesum) || make(mdi)
247- RUST_STAGE0_VER = 1.49 .0
248- RUST_ARCH = i686 -unknown-netbsd
261+ RUST_STAGE0_VER = 1.50 .0
262+ RUST_ARCH = i586 -unknown-netbsd
249263RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
250264RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
251265SITES.${RUST_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
@@ -261,15 +275,15 @@ pre-build-fix:
261275 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR} /rust-bootstrap/bin/rustc
262276.endif
263277.if !empty(MACHINE_PLATFORM :MNetBSD-* -x86_64) || make(distinfo) || make (makesum) || make(mdi)
264- RUST_STAGE0_VER = 1.49 .0
278+ RUST_STAGE0_VER = 1.50 .0
265279RUST_ARCH = x86_64-unknown-netbsd
266280RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
267281RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
268282DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
269283pre-build-fix :
270284.endif
271285.if !empty(MACHINE_PLATFORM :MNetBSD-* -powerpc) || make(distinfo) || make (makesum) || make(mdi)
272- RUST_STAGE0_VER = 1.49 .0
286+ RUST_STAGE0_VER = 1.50 .0
273287RUST_ARCH = powerpc-unknown-netbsd
274288
275289# Cross-built against NetBSD 9.0
@@ -293,7 +307,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
293307pre-build-fix :
294308.endif
295309.if !empty(MACHINE_PLATFORM :MNetBSD-* -aarch64) || make(distinfo) || make (makesum) || make(mdi)
296- RUST_STAGE0_VER = 1.49 .0
310+ RUST_STAGE0_VER = 1.50 .0
297311RUST_ARCH = aarch64-unknown-netbsd
298312RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
299313RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -303,7 +317,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
303317pre-build-fix :
304318.endif
305319.if !empty(MACHINE_PLATFORM :MNetBSD-* -sparc64) || make(distinfo) || make (makesum) || make(mdi)
306- RUST_STAGE0_VER = 1.49 .0
320+ RUST_STAGE0_VER = 1.50 .0
307321RUST_ARCH = sparc64-unknown-netbsd
308322RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
309323RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -314,7 +328,7 @@ pre-build-fix:
314328.endif
315329.if !empty(MACHINE_PLATFORM :MNetBSD-* -earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
316330RUST_ARCH = armv7-unknown-netbsd-eabihf
317- RUST_STAGE0_VER = 1.49 .0
331+ RUST_STAGE0_VER = 1.50 .0
318332RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
319333RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
320334DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -354,8 +368,16 @@ SUBST_VARS.rpath= PREFIX
354368# updating and verification.
355369#
356370CKSUM_CRATES+ = vendor/libc
357- CKSUMS+ = 0134ce769d06b1b1f50ad15d1aa7bd8d44bcd2f66c6318dd906de8bc4a4044c7
358- CKSUMS+ = 1107d18986be8af262f7a7c14761a9faf0228dc8a773379b9d7e8d2f711b3f37
371+ CKSUMS+ = 8d7ddc8dd25a9404f9181a49438d9506c676cfd4b6fa21dbe5c1f9969abc4b91
372+ CKSUMS+ = f147be95b04ea1303171dff46c5a66b08cd47ccd0a4c346d5bcec7a8aaac3fc4
373+
374+ CKSUM_CRATES+ = vendor/cc-1.0.60
375+ CKSUMS+ = 903c5f2f5dd0cc7d04f99f605a95e6abde8b38156fd4e73eefc58493f55a4e5a
376+ CKSUMS+ = e45520f4dda532240e4ec28af550fcb76f44090361f273bebcf0d07dc0807885
377+
378+ CKSUM_CRATES+ = vendor/rustc-ap-rustc_target
379+ CKSUMS+ = ab83c62fab6927a47fc3d15c02eec41174ea9f3e8dce5c53adab613d48918bc5
380+ CKSUMS+ = 01f50edc3845bd03459d525444150d03f57cdb479de2668a71c1538adf3d340a
359381
360382CKSUM_CRATES+ = vendor/lzma-sys
361383CKSUMS+ = 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -371,7 +393,7 @@ CKSUMS+= 9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12
371393
372394CKSUM_CRATES+ = vendor/openssl-src
373395CKSUMS+ = 03dcdaac7de880b860ecfe859ba2ac3e46c8f46a7bf948aa674147eebee421b0
374- CKSUMS+ = 90456c77ade1702fbf116d9cdc57c0c8dba5f059f591d3dffc9b54c7a7088be8
396+ CKSUMS+ = 580a24c5a739e688e488498b8a34e27a3284c3160e6d3aaff711a80774c35c48
375397
376398SUBST_CLASSES+ = cksum
377399SUBST_STAGE.cksum = pre-configure
0 commit comments