1
- # $NetBSD: Makefile,v 1.320 2024/11/14 22:20:32 wiz Exp $
1
+ # $NetBSD: Makefile,v 1.321 2024/11/24 16:13:42 he Exp $
2
2
3
- DISTNAME = rustc-1.80.1 -src
3
+ DISTNAME = rustc-1.81.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
@@ -20,6 +19,13 @@ USE_LANGUAGES= c c++
20
19
USE_LIBTOOL = yes
21
20
USE_TOOLS+ = bash grep gmake perl:build pkg-config
22
21
22
+ # This is a bug:
23
+ # https://github.com/rust-lang/rust/issues/130708
24
+ # "Building rust 1.81.0 does network access in the "build" phase"
25
+ # but set it for now to allow progress in finding other build issues.
26
+ # ALLOW_NETWORK_ACCESS= yes
27
+ # Ref. dist.vendor below.
28
+
23
29
# The NetBSD bootstraps are built for NetBSD 9 (because rust doesn't
24
30
# build on 8 or earlier), or because the target didn't exist in 8
25
31
# or 9 (as in riscv64). Therefore, mark earlier versions as broken.
@@ -42,6 +48,8 @@ CONFIGURE_ARGS+= --disable-compiler-docs
42
48
CONFIGURE_ARGS+ = --disable-llvm-static-stdcpp
43
49
CONFIGURE_ARGS+ = --disable-ninja
44
50
CONFIGURE_ARGS+ = --dist-compression-formats=xz
51
+ # Ref. issue #130708 & backport of pull-request 130110
52
+ CONFIGURE_ARGS+ = --set dist.vendor=false
45
53
46
54
# Include (optional) settings to cross-build rust
47
55
.include "cross.mk"
@@ -201,52 +209,50 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
201
209
#
202
210
DISTFILES: = ${DEFAULT_DISTFILES}
203
211
204
- NB = nb1
205
-
206
212
.if ${MACHINE_PLATFORM :MDarwin-* -aarch64} || make(distinfo) || make (makesum) || make(mdi)
207
- RUST_STAGE0_VER = 1.79.0
213
+ RUST_STAGE0_VER = 1.80.1
208
214
RUST_ARCH: = aarch64-apple-darwin
209
215
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
210
216
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
211
217
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
212
218
.endif
213
219
.if ${MACHINE_PLATFORM :MDarwin-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
214
- RUST_STAGE0_VER = 1.79.0
220
+ RUST_STAGE0_VER = 1.80.1
215
221
RUST_ARCH: = x86_64-apple-darwin
216
222
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
217
223
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
218
224
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
219
225
.endif
220
226
.if ${MACHINE_PLATFORM :MLinux-* -aarch64} || make(distinfo) || make (makesum) || make(mdi)
221
- RUST_STAGE0_VER = 1.79.0
227
+ RUST_STAGE0_VER = 1.80.1
222
228
RUST_ARCH: = aarch64-unknown-linux-gnu
223
229
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
224
230
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
225
231
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
226
232
.endif
227
233
.if ${MACHINE_PLATFORM :MLinux-* -earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
228
- RUST_STAGE0_VER = 1.79.0
234
+ RUST_STAGE0_VER = 1.80.1
229
235
RUST_ARCH: = arm-unknown-linux-gnueabihf
230
236
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
231
237
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
232
238
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
233
239
.endif
234
240
.if ${MACHINE_PLATFORM :MLinux-* -earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
235
- RUST_STAGE0_VER = 1.79.0
241
+ RUST_STAGE0_VER = 1.80.1
236
242
RUST_ARCH: = armv7-unknown-linux-gnueabihf
237
243
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
238
244
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
239
245
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
240
246
.endif
241
247
.if ${MACHINE_PLATFORM :MLinux-* -i386} || make(distinfo) || make (makesum) || make(mdi)
242
- RUST_STAGE0_VER = 1.79.0
248
+ RUST_STAGE0_VER = 1.80.1
243
249
RUST_ARCH: = i686-unknown-linux-gnu
244
250
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
245
251
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
246
252
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
247
253
.endif
248
254
.if ${MACHINE_PLATFORM :MLinux-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
249
- RUST_STAGE0_VER = 1.79.0
255
+ RUST_STAGE0_VER = 1.80.1
250
256
RUST_ARCH: = x86_64-unknown-linux-gnu
251
257
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
252
258
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -258,7 +264,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
258
264
# x86_64-sun-solaris bootstrap and comment out the overrides.
259
265
#
260
266
.if ${MACHINE_PLATFORM :MSunOS-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
261
- RUST_STAGE0_VER = 1.79.0
267
+ RUST_STAGE0_VER = 1.80.1
262
268
RUST_ARCH: = x86_64-unknown-illumos
263
269
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
264
270
SITES.${RUST_STAGE0} = https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
@@ -271,14 +277,14 @@ CONFIGURE_ARGS+= --host=${RUST_ARCH}
271
277
CONFIGURE_ARGS+ = --target=${RUST_ARCH}
272
278
.endif
273
279
.if ${MACHINE_PLATFORM :MFreeBSD-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
274
- RUST_STAGE0_VER = 1.79.0
280
+ RUST_STAGE0_VER = 1.80.1
275
281
RUST_ARCH: = x86_64-unknown-freebsd
276
282
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
277
283
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
278
284
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
279
285
.endif
280
286
.if ${MACHINE_PLATFORM :MNetBSD-* -i386} || make(distinfo) || make (makesum) || make(mdi)
281
- RUST_STAGE0_VER = 1.79.0
287
+ RUST_STAGE0_VER = 1.80.1
282
288
RUST_ARCH = i586-unknown-netbsd
283
289
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
284
290
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -298,14 +304,14 @@ pre-build-fix-paxctl:
298
304
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR} /rust-bootstrap/bin/rustc
299
305
.endif
300
306
.if ${MACHINE_PLATFORM :MNetBSD-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
301
- RUST_STAGE0_VER = 1.79.0
307
+ RUST_STAGE0_VER = 1.80.1
302
308
RUST_ARCH = x86_64-unknown-netbsd
303
309
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
304
310
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
305
311
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
306
312
.endif
307
313
.if ${MACHINE_PLATFORM :MNetBSD-* -powerpc} || make(distinfo) || make (makesum) || make(mdi)
308
- RUST_STAGE0_VER = 1.79.0
314
+ RUST_STAGE0_VER = 1.80.1
309
315
RUST_ARCH = powerpc-unknown-netbsd
310
316
311
317
# Cross-built against NetBSD 9.0
@@ -317,10 +323,10 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
317
323
318
324
.endif
319
325
.if ${MACHINE_PLATFORM :MNetBSD-* -aarch64} || make(distinfo) || make (makesum) || make(mdi)
320
- RUST_STAGE0_VER = 1.79.0
326
+ RUST_STAGE0_VER = 1.80.1
321
327
RUST_ARCH = aarch64-unknown-netbsd
322
- RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB} .tar.xz
323
- RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB} .tar.xz
328
+ RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
329
+ RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
324
330
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
325
331
SITES.${RUST_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
326
332
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
@@ -335,7 +341,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
335
341
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
336
342
.endif
337
343
.if ${MACHINE_PLATFORM :MNetBSD-* -sparc64} || make(distinfo) || make (makesum) || make(mdi)
338
- RUST_STAGE0_VER = 1.79.0
344
+ RUST_STAGE0_VER = 1.80.1
339
345
RUST_ARCH = sparc64-unknown-netbsd
340
346
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
341
347
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -345,25 +351,25 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
345
351
.endif
346
352
.if ${MACHINE_PLATFORM :MNetBSD-* -earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
347
353
RUST_ARCH = armv7-unknown-netbsd-eabihf
348
- RUST_STAGE0_VER = 1.79.0
349
- RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB} .tar.xz
350
- RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB} .tar.xz
354
+ RUST_STAGE0_VER = 1.80.1
355
+ RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
356
+ RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
351
357
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
352
358
SITES.${RUST_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
353
359
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
354
360
.endif
355
361
.if ${MACHINE_PLATFORM :MNetBSD-* -earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
356
362
RUST_ARCH = armv6-unknown-netbsd-eabihf
357
- RUST_STAGE0_VER = 1.79.0
358
- RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB} .tar.xz
359
- RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}-${NB} .tar.xz
363
+ RUST_STAGE0_VER = 1.80.1
364
+ RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
365
+ RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
360
366
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
361
367
SITES.${RUST_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
362
368
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
363
369
.endif
364
370
# .if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
365
371
# RUST_ARCH= mipsel-unknown-netbsd
366
- # RUST_STAGE0_VER= 1.79.0
372
+ # RUST_STAGE0_VER= 1.80.1
367
373
# RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
368
374
# RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
369
375
# DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -372,7 +378,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
372
378
# .endif
373
379
.if ${MACHINE_PLATFORM :MNetBSD-* -riscv64} || make(distinfo) || make (makesum) || make(mdi)
374
380
RUST_ARCH = riscv64gc-unknown-netbsd
375
- RUST_STAGE0_VER = 1.79.0
381
+ RUST_STAGE0_VER = 1.80.1
376
382
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
377
383
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
378
384
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -432,10 +438,6 @@ CKSUM_CRATES+= vendor/libc-0.2.155
432
438
CKSUMS+ = 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
433
439
CKSUMS+ = 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
434
440
435
- CKSUM_CRATES+ = vendor/libc-0.2.154
436
- CKSUMS+ = 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
437
- CKSUMS+ = 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
438
-
439
441
CKSUM_CRATES+ = vendor/zerocopy-0.7.32
440
442
CKSUMS+ = 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
441
443
CKSUMS+ = abe079743c2b2dea5b2c42564f98741a5eb9e24ff019e01742ace5581e53c06f
@@ -456,6 +458,18 @@ CKSUMS+= 1b26fca824c410077780fbc2f4c53c1d195ba3bdf6785b529ceb0a11f039cec2
456
458
CKSUMS+ = 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b
457
459
CKSUMS+ = 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0
458
460
461
+ CKSUM_CRATES+ = vendor/memchr-2.7.4
462
+ CKSUMS+ = 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0
463
+ CKSUMS+ = 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450
464
+ CKSUMS+ = 7763472d43c66df596ca0697c07db0b4666d38a6a14f64f9f298aaf756c4a715
465
+ CKSUMS+ = 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af
466
+ CKSUMS+ = 3b15d5cb9715f26e655598eacbb8bbba74cbe8ddb2fb969d13aa75f216a118dd
467
+ CKSUMS+ = 8844a2cd5e71abb8efdf8fc3ee54d9c66f3fedb529cdaf5984c279177f5f90af
468
+ CKSUMS+ = 6ae779ec5d00f443075316e0105edf30b489a38e2e96325bec14ccecd014145b
469
+ CKSUMS+ = 28d66e566b73f6f0f7add4092874dc967ce133bfb6dcbd81f03c9a04b6e4e1d0
470
+ CKSUMS+ = 44cd1a614bd66f1e66fc86c541d3c3b8d3a14a644c13e8bf816df3f555eac2d4
471
+ CKSUMS+ = 27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720
472
+
459
473
CKSUM_CRATES+ = vendor/memchr-2.7.1
460
474
CKSUMS+ = 5bb70f915084e629d940dbc322f5b9096b2e658cf63fea8a2f6e7550412e73a0
461
475
CKSUMS+ = 34aaa34eb7048e8bba49d390942ab707990380952f37f388f3cca30970c53450
@@ -634,7 +648,7 @@ stage0-bootstrap: install
634
648
${CP} `${PKG_CC} -print-file-name=$${lib}` \
635
649
${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
636
650
done; \
637
- for lib in libLLVM-17 .so libcrypto.so.3 libcurl.so.4 \
651
+ for lib in libLLVM.so.18.1 libcrypto.so.3 libcurl.so.4 \
638
652
libssl.so.3 libz.so.1 libzstd.so.1; do \
639
653
${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
640
654
done; \
0 commit comments