Thu Feb 18 15:41:03 2021 UTC ()
rust: switch to bsdtar from gtar


(wiz)
diff -r1.217 -r1.218 pkgsrc/lang/rust/Makefile
cvs diff -r1.217 -r1.218 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2021/02/14 08:24:30 1.217
+++ pkgsrc/lang/rust/Makefile 2021/02/18 15:41:03 1.218
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.217 2021/02/14 08:24:30 he Exp $ 1# $NetBSD: Makefile,v 1.218 2021/02/18 15:41:03 wiz Exp $
2 2
3DISTNAME= rustc-1.49.0-src 3DISTNAME= rustc-1.49.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= https://static.rust-lang.org/dist/ 6MASTER_SITES= https://static.rust-lang.org/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.rust-lang.org/ 9HOMEPAGE= https://www.rust-lang.org/
10COMMENT= Safe, concurrent, practical language 10COMMENT= Safe, concurrent, practical language
11LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
12 12
13CONFLICTS+= rust-bin-[0-9]* 13CONFLICTS+= rust-bin-[0-9]*
14 14
@@ -433,27 +433,27 @@ fix-darwin-install-name: @@ -433,27 +433,27 @@ fix-darwin-install-name:
433.endif 433.endif
434 434
435GENERATE_PLIST+= ${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \ 435GENERATE_PLIST+= ${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
436 ${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ; 436 ${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
437 437
438# Create a relocatable stage2 bootstrap from the bits we just built that can be 438# Create a relocatable stage2 bootstrap from the bits we just built that can be
439# used to build the next version of rust. Currently only tested on SmartOS. 439# used to build the next version of rust. Currently only tested on SmartOS.
440# 440#
441# Use the alternate BOOTSTRAP_NAME when creating a nightly release. 441# Use the alternate BOOTSTRAP_NAME when creating a nightly release.
442# 442#
443#BOOTSTRAP_NAME= ${PKGNAME_NOREV:C/rust/rust-nightly/}-${RUST_ARCH} 443#BOOTSTRAP_NAME= ${PKGNAME_NOREV:C/rust/rust-nightly/}-${RUST_ARCH}
444BOOTSTRAP_NAME= ${PKGNAME_NOREV}-${RUST_ARCH} 444BOOTSTRAP_NAME= ${PKGNAME_NOREV}-${RUST_ARCH}
445BOOTSTRAP_TMPDIR= ${WRKDIR}/${BOOTSTRAP_NAME} 445BOOTSTRAP_TMPDIR= ${WRKDIR}/${BOOTSTRAP_NAME}
446USE_TOOLS+= gtar 446#USE_TOOLS+= bsdtar
447 447
448# The NetBSD part is so far untested, because I could not convince 448# The NetBSD part is so far untested, because I could not convince
449# the rust build to use the gcc wrapper when building natively, 449# the rust build to use the gcc wrapper when building natively,
450# so that I could get a placeholder in the RPATH, because chrpath 450# so that I could get a placeholder in the RPATH, because chrpath
451# cannot extend the length of the RPATH... 451# cannot extend the length of the RPATH...
452ELFEDIT?= /usr/bin/elfedit 452ELFEDIT?= /usr/bin/elfedit
453 453
454.PHONY: stage0-bootstrap 454.PHONY: stage0-bootstrap
455stage0-bootstrap: install 455stage0-bootstrap: install
456 ${RM} -rf ${BOOTSTRAP_TMPDIR} 456 ${RM} -rf ${BOOTSTRAP_TMPDIR}
457 ${MKDIR} ${BOOTSTRAP_TMPDIR} 457 ${MKDIR} ${BOOTSTRAP_TMPDIR}
458.if ${OPSYS} == "NetBSD" 458.if ${OPSYS} == "NetBSD"
459 (cd ${BOOTSTRAP_TMPDIR}; \ 459 (cd ${BOOTSTRAP_TMPDIR}; \