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 $
2
2
3
- DISTNAME = rustc-1.50 .0-src
3
+ DISTNAME = rustc-1.51 .0-src
4
4
PKGNAME = ${DISTNAME:S/rustc/rust/:S/-src//}
5
- PKGREVISION = 3
6
5
CATEGORIES = lang
7
6
MASTER_SITES = https://static.rust-lang.org/dist/
8
7
@@ -19,7 +18,7 @@ GCC_REQD+= 5
19
18
USE_GCC_RUNTIME = yes
20
19
USE_LANGUAGES = c c++11
21
20
USE_LIBTOOL = yes
22
- USE_TOOLS+ = bash ggrep gmake perl:build pkg-config
21
+ USE_TOOLS+ = bash grep gmake perl:build pkg-config
23
22
24
23
# The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
25
24
# build on 7). Mark earlier versions as broken.
@@ -46,20 +45,6 @@ CONFIGURE_ARGS+= --disable-dist-src
46
45
CONFIGURE_ARGS+ = --disable-llvm-static-stdcpp
47
46
CONFIGURE_ARGS+ = --disable-ninja
48
47
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
-
63
48
# Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
64
49
# uncommenting the LD_LIBRARY_PATH setting may be required to run
65
50
# the bootstrap
@@ -84,6 +69,35 @@ CHECK_SSP_SUPPORTED= no
84
69
85
70
.include "../../mk/bsd.prefs.mk"
86
71
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
+
87
101
.if !empty(MACHINE_PLATFORM :MNetBSD-* -powerpc) || \
88
102
!empty(MACHINE_PLATFORM :MNetBSD-* -earmv7hf) || \
89
103
!empty(TARGET :Marmv7-unknown-netbsd-eabihf)
@@ -135,7 +149,7 @@ CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
135
149
# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
136
150
# \todo Consider avoiding setting this on netbsd-9 past the fix.
137
151
. if ${MACHINE_PLATFORM :MNetBSD-[1-9].* } && !${MACHINE_PLATFORM:MNetBSD-9.99.* }
138
- MAKE_JOBS_SAFE = no
152
+ MAKE_JOBS_SAFE? = no
139
153
. endif
140
154
141
155
# Open PRs
@@ -161,55 +175,55 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
161
175
DISTFILES: = ${DEFAULT_DISTFILES}
162
176
163
177
.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
165
179
RUST_ARCH: = aarch64-apple-darwin
166
180
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
167
181
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
168
182
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
169
183
pre-build-fix :
170
184
.endif
171
185
.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
173
187
RUST_ARCH: = x86_64-apple-darwin
174
188
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
175
189
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
176
190
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
177
191
pre-build-fix :
178
192
.endif
179
193
.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
181
195
RUST_ARCH: = aarch64-unknown-linux-gnu
182
196
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
183
197
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
184
198
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
185
199
pre-build-fix :
186
200
.endif
187
201
.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
189
203
RUST_ARCH: = arm-unknown-linux-gnueabihf
190
204
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
191
205
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
192
206
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
193
207
pre-build-fix :
194
208
.endif
195
209
.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
197
211
RUST_ARCH: = armv7-unknown-linux-gnueabihf
198
212
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
199
213
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
200
214
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
201
215
pre-build-fix :
202
216
.endif
203
217
.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
205
219
RUST_ARCH: = i686-unknown-linux-gnu
206
220
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
207
221
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
208
222
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
209
223
pre-build-fix :
210
224
.endif
211
225
.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
213
227
RUST_ARCH: = x86_64-unknown-linux-gnu
214
228
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
215
229
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -222,7 +236,7 @@ pre-build-fix:
222
236
# x86_64-sun-solaris bootstrap and comment out the overrides.
223
237
#
224
238
.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
226
240
RUST_ARCH: = x86_64-unknown-illumos
227
241
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
228
242
SITES.${RUST_STAGE0} = https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -236,16 +250,16 @@ CONFIGURE_ARGS+= --target=${RUST_ARCH}
236
250
pre-build-fix :
237
251
.endif
238
252
.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
240
254
RUST_ARCH: = x86_64-unknown-freebsd
241
255
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
242
256
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
243
257
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
244
258
pre-build-fix :
245
259
.endif
246
260
.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
249
263
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
250
264
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
251
265
SITES.${RUST_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
@@ -261,15 +275,15 @@ pre-build-fix:
261
275
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR} /rust-bootstrap/bin/rustc
262
276
.endif
263
277
.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
265
279
RUST_ARCH = x86_64-unknown-netbsd
266
280
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
267
281
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
268
282
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
269
283
pre-build-fix :
270
284
.endif
271
285
.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
273
287
RUST_ARCH = powerpc-unknown-netbsd
274
288
275
289
# Cross-built against NetBSD 9.0
@@ -293,7 +307,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
293
307
pre-build-fix :
294
308
.endif
295
309
.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
297
311
RUST_ARCH = aarch64-unknown-netbsd
298
312
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
299
313
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -303,7 +317,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
303
317
pre-build-fix :
304
318
.endif
305
319
.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
307
321
RUST_ARCH = sparc64-unknown-netbsd
308
322
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
309
323
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -314,7 +328,7 @@ pre-build-fix:
314
328
.endif
315
329
.if !empty(MACHINE_PLATFORM :MNetBSD-* -earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
316
330
RUST_ARCH = armv7-unknown-netbsd-eabihf
317
- RUST_STAGE0_VER = 1.49 .0
331
+ RUST_STAGE0_VER = 1.50 .0
318
332
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
319
333
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
320
334
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -354,8 +368,16 @@ SUBST_VARS.rpath= PREFIX
354
368
# updating and verification.
355
369
#
356
370
CKSUM_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
359
381
360
382
CKSUM_CRATES+ = vendor/lzma-sys
361
383
CKSUMS+ = 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -371,7 +393,7 @@ CKSUMS+= 9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12
371
393
372
394
CKSUM_CRATES+ = vendor/openssl-src
373
395
CKSUMS+ = 03dcdaac7de880b860ecfe859ba2ac3e46c8f46a7bf948aa674147eebee421b0
374
- CKSUMS+ = 90456c77ade1702fbf116d9cdc57c0c8dba5f059f591d3dffc9b54c7a7088be8
396
+ CKSUMS+ = 580a24c5a739e688e488498b8a34e27a3284c3160e6d3aaff711a80774c35c48
375
397
376
398
SUBST_CLASSES+ = cksum
377
399
SUBST_STAGE.cksum = pre-configure
0 commit comments