1
- # $NetBSD: Makefile,v 1.323 2025/02/06 13:34:44 riastradh Exp $
1
+ # $NetBSD: Makefile,v 1.324 2025/02/23 08:53:54 he Exp $
2
2
3
- DISTNAME = rustc-1.82 .0-src
3
+ DISTNAME = rustc-1.83 .0-src
4
4
PKGNAME = ${DISTNAME:S/rustc/rust/:S/-src//}
5
5
CATEGORIES = lang
6
6
MASTER_SITES = https://static.rust-lang.org/dist/
@@ -61,6 +61,7 @@ CONFIGURE_ARGS+= ${ADD_CONFIGURE_ARGS}
61
61
# uncommenting the LD_LIBRARY_PATH setting may be required to run
62
62
# the bootstrap
63
63
PKGSRC_MAKE_ENV+ = LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
64
+ MAKE_ENV+ = LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
64
65
65
66
# This should allow us to perform "offline" builds (so cargo doesn't fetch
66
67
# dependencies during the build stage) but this isn't hooked up yet.
@@ -90,6 +91,11 @@ CHECK_SSP_SUPPORTED= no
90
91
91
92
.include "../../mk/bsd.prefs.mk"
92
93
94
+ .if ${OPSYS} == "NetBSD"
95
+ TOOL_DEPENDS+ = patchelf-[0-9]*:../../devel/patchelf
96
+ FORCE_RPATH = --force-rpath
97
+ .endif
98
+
93
99
# Allow overriding MAKE_JOBS_SAFE
94
100
# some may chose to mostly build faster,
95
101
# and deal with any failures due to deadlocks
@@ -210,49 +216,49 @@ BUILDLINK_TRANSFORM+= opt:x86_64:arm64
210
216
DISTFILES: = ${DEFAULT_DISTFILES}
211
217
212
218
.if ${MACHINE_PLATFORM :MDarwin-* -aarch64} || make(distinfo) || make (makesum) || make(mdi)
213
- RUST_STAGE0_VER = 1.81 .0
219
+ RUST_STAGE0_VER = 1.82 .0
214
220
RUST_ARCH: = aarch64-apple-darwin
215
221
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
216
222
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
217
223
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
218
224
.endif
219
225
.if ${MACHINE_PLATFORM :MDarwin-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
220
- RUST_STAGE0_VER = 1.81 .0
226
+ RUST_STAGE0_VER = 1.82 .0
221
227
RUST_ARCH: = x86_64-apple-darwin
222
228
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
223
229
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
224
230
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
225
231
.endif
226
232
.if ${MACHINE_PLATFORM :MLinux-* -aarch64} || make(distinfo) || make (makesum) || make(mdi)
227
- RUST_STAGE0_VER = 1.81 .0
233
+ RUST_STAGE0_VER = 1.82 .0
228
234
RUST_ARCH: = aarch64-unknown-linux-gnu
229
235
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
230
236
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
231
237
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
232
238
.endif
233
239
.if ${MACHINE_PLATFORM :MLinux-* -earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
234
- RUST_STAGE0_VER = 1.81 .0
240
+ RUST_STAGE0_VER = 1.82 .0
235
241
RUST_ARCH: = arm-unknown-linux-gnueabihf
236
242
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
237
243
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
238
244
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
239
245
.endif
240
246
.if ${MACHINE_PLATFORM :MLinux-* -earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
241
- RUST_STAGE0_VER = 1.81 .0
247
+ RUST_STAGE0_VER = 1.82 .0
242
248
RUST_ARCH: = armv7-unknown-linux-gnueabihf
243
249
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
244
250
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
245
251
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
246
252
.endif
247
253
.if ${MACHINE_PLATFORM :MLinux-* -i386} || make(distinfo) || make (makesum) || make(mdi)
248
- RUST_STAGE0_VER = 1.81 .0
254
+ RUST_STAGE0_VER = 1.82 .0
249
255
RUST_ARCH: = i686-unknown-linux-gnu
250
256
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
251
257
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
252
258
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
253
259
.endif
254
260
.if ${MACHINE_PLATFORM :MLinux-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
255
- RUST_STAGE0_VER = 1.81 .0
261
+ RUST_STAGE0_VER = 1.82 .0
256
262
RUST_ARCH: = x86_64-unknown-linux-gnu
257
263
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
258
264
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -264,7 +270,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
264
270
# x86_64-sun-solaris bootstrap and comment out the overrides.
265
271
#
266
272
.if ${MACHINE_PLATFORM :MSunOS-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
267
- RUST_STAGE0_VER = 1.81 .0
273
+ RUST_STAGE0_VER = 1.82 .0
268
274
RUST_ARCH: = x86_64-unknown-illumos
269
275
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
270
276
SITES.${RUST_STAGE0} = https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
@@ -277,14 +283,14 @@ CONFIGURE_ARGS+= --host=${RUST_ARCH}
277
283
CONFIGURE_ARGS+ = --target=${RUST_ARCH}
278
284
.endif
279
285
.if ${MACHINE_PLATFORM :MFreeBSD-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
280
- RUST_STAGE0_VER = 1.81 .0
286
+ RUST_STAGE0_VER = 1.82 .0
281
287
RUST_ARCH: = x86_64-unknown-freebsd
282
288
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
283
289
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
284
290
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
285
291
.endif
286
292
.if ${MACHINE_PLATFORM :MNetBSD-* -i386} || make(distinfo) || make (makesum) || make(mdi)
287
- RUST_STAGE0_VER = 1.81 .0
293
+ RUST_STAGE0_VER = 1.82 .0
288
294
RUST_ARCH = i586-unknown-netbsd
289
295
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
290
296
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -304,14 +310,14 @@ pre-build-fix-paxctl:
304
310
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR} /rust-bootstrap/bin/rustc
305
311
.endif
306
312
.if ${MACHINE_PLATFORM :MNetBSD-* -x86_64} || make(distinfo) || make (makesum) || make(mdi)
307
- RUST_STAGE0_VER = 1.81 .0
313
+ RUST_STAGE0_VER = 1.82 .0
308
314
RUST_ARCH = x86_64-unknown-netbsd
309
315
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
310
316
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
311
317
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
312
318
.endif
313
319
.if ${MACHINE_PLATFORM :MNetBSD-* -powerpc} || make(distinfo) || make (makesum) || make(mdi)
314
- RUST_STAGE0_VER = 1.81 .0
320
+ RUST_STAGE0_VER = 1.82 .0
315
321
RUST_ARCH = powerpc-unknown-netbsd
316
322
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
317
323
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -320,7 +326,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
320
326
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
321
327
.endif
322
328
.if ${MACHINE_PLATFORM :MNetBSD-* -aarch64} || make(distinfo) || make (makesum) || make(mdi)
323
- RUST_STAGE0_VER = 1.81 .0
329
+ RUST_STAGE0_VER = 1.82 .0
324
330
RUST_ARCH = aarch64-unknown-netbsd
325
331
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
326
332
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -329,7 +335,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
329
335
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
330
336
.endif
331
337
.if ${MACHINE_PLATFORM :MNetBSD-* -aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
332
- RUST_STAGE0_VER = 1.81 .0
338
+ RUST_STAGE0_VER = 1.82 .0
333
339
RUST_ARCH = aarch64_be-unknown-netbsd
334
340
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
335
341
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -338,7 +344,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
338
344
SITES.${RUST_STD_STAGE0} = ${MASTER_SITE_LOCAL:=rust/}
339
345
.endif
340
346
.if ${MACHINE_PLATFORM :MNetBSD-* -sparc64} || make(distinfo) || make (makesum) || make(mdi)
341
- RUST_STAGE0_VER = 1.81 .0
347
+ RUST_STAGE0_VER = 1.82 .0
342
348
RUST_ARCH = sparc64-unknown-netbsd
343
349
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
344
350
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -348,7 +354,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
348
354
.endif
349
355
.if ${MACHINE_PLATFORM :MNetBSD-* -earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
350
356
RUST_ARCH = armv7-unknown-netbsd-eabihf
351
- RUST_STAGE0_VER = 1.81 .0
357
+ RUST_STAGE0_VER = 1.82 .0
352
358
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
353
359
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
354
360
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -357,7 +363,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
357
363
.endif
358
364
.if ${MACHINE_PLATFORM :MNetBSD-* -earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
359
365
RUST_ARCH = armv6-unknown-netbsd-eabihf
360
- RUST_STAGE0_VER = 1.81 .0
366
+ RUST_STAGE0_VER = 1.82 .0
361
367
RUST_STAGE0: = rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
362
368
RUST_STD_STAGE0: = rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
363
369
DISTFILES: = ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -366,7 +372,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
366
372
.endif
367
373
# .if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
368
374
# RUST_ARCH= mipsel-unknown-netbsd
369
- # RUST_STAGE0_VER= 1.81 .0
375
+ # RUST_STAGE0_VER= 1.82 .0
370
376
# RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
371
377
# RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
372
378
# DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -457,7 +463,7 @@ CKSUMS+= 27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720
457
463
458
464
CKSUM_CRATES+ = vendor/bytecount-0.6.8
459
465
CKSUMS+ = 01cd755a128d8a5892f3edda195b26bb461be375be17dd72e6e4f061169e6dff
460
- CKSUMS+ = a6750c0e2a6c385ec902cd7f87de7835fe2b4171b9c83da64122274ee20a77c6
466
+ CKSUMS+ = 7c6609685c161ac6b2c667f59bd6476c5c14c7269ec949fb2def5a0238198c25
461
467
462
468
SUBST_CLASSES+ = cksum
463
469
SUBST_STAGE.cksum = pre-configure
@@ -543,11 +549,30 @@ do-test:
543
549
${SETENV} ${MAKE_ENV} \
544
550
${TOOL_PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
545
551
552
+ PATCH_BINARIES+ = bin/cargo
553
+ PATCH_BINARIES+ = bin/cargo-clippy
554
+ PATCH_BINARIES+ = bin/clippy-driver
555
+ PATCH_BINARIES+ = bin/rust-analyzer
556
+ PATCH_BINARIES+ = bin/rustc
557
+ PATCH_BINARIES+ = bin/rustdoc
558
+ PATCH_BINARIES+ = bin/rustfmt
559
+ PATCH_BINARIES+ = libexec/rust-analyzer-proc-macro-srv
560
+
546
561
do-install :
547
562
${RUN}${_ULIMIT_CMD} \
548
563
cd ${WRKSRC} && \
549
564
${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
550
565
${TOOL_PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
566
+ .if ${OPSYS} == "NetBSD"
567
+ for bin in ${PATCH_BINARIES}; do \
568
+ f=${DESTDIR}${PREFIX}/$${bin}; \
569
+ if [ -f $$f ]; then \
570
+ cmd ="${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f"; \
571
+ echo $$cmd; \
572
+ $$cmd; \
573
+ fi; \
574
+ done
575
+ .endif
551
576
552
577
SUBST_CLASSES+ = destdir
553
578
SUBST_STAGE.destdir = post-install
0 commit comments