Thu Oct 24 17:34:10 2019 UTC ()
rust: Switch to using pkgsrc gzip for extraction on SunOS.

Something in the rust-1.38 tarball is tickling a bug in the version of
gzip shipped at least on SmartOS.


(jperkin)
diff -r1.117 -r1.118 pkgsrc/lang/rust/Makefile
cvs diff -r1.117 -r1.118 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2019/10/02 12:51:43 1.117
+++ pkgsrc/lang/rust/Makefile 2019/10/24 17:34:10 1.118
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.117 2019/10/02 12:51:43 he Exp $ 1# $NetBSD: Makefile,v 1.118 2019/10/24 17:34:10 jperkin Exp $
2 2
3DISTNAME= rustc-1.38.0-src 3DISTNAME= rustc-1.38.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://static.rust-lang.org/dist/ 6MASTER_SITES= http://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
13USE_GCC_RUNTIME= yes 13USE_GCC_RUNTIME= yes
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
@@ -270,28 +270,30 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCA @@ -270,28 +270,30 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCA
270SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 270SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
271pre-build-fix: 271pre-build-fix:
272.endif 272.endif
273 273
274# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf if you have a local bootstrap compiler. 274# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf if you have a local bootstrap compiler.
275.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH) 275.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH)
276NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} 276NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM}
277.else 277.else
278RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap 278RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap
279.endif 279.endif
280 280
281.if ${OPSYS} == "SunOS" 281.if ${OPSYS} == "SunOS"
282BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils 282BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils
 283BUILD_DEPENDS+= gzip>=0:../../archivers/gzip
283TOOLS_CREATE+= md5sum 284TOOLS_CREATE+= md5sum
284TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum 285TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum
 286TOOLS_PLATFORM.gzcat= ${PREFIX}/bin/gzip -cd
285.endif 287.endif
286 288
287SUBST_CLASSES+= rpath 289SUBST_CLASSES+= rpath
288SUBST_STAGE.rpath= pre-configure 290SUBST_STAGE.rpath= pre-configure
289SUBST_FILES.rpath= src/bootstrap/bin/rustc.rs 291SUBST_FILES.rpath= src/bootstrap/bin/rustc.rs
290SUBST_FILES.rpath+= src/build_helper/lib.rs 292SUBST_FILES.rpath+= src/build_helper/lib.rs
291SUBST_FILES.rpath+= src/librustc_codegen_ssa/back/linker.rs 293SUBST_FILES.rpath+= src/librustc_codegen_ssa/back/linker.rs
292SUBST_VARS.rpath= PREFIX 294SUBST_VARS.rpath= PREFIX
293 295
294post-extract: 296post-extract:
295 set -e; \ 297 set -e; \
296 if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \ 298 if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \
297 -a ! -e ${RUST_BOOTSTRAP_PATH}/bin/rustc; then \ 299 -a ! -e ${RUST_BOOTSTRAP_PATH}/bin/rustc; then \