Fri Mar 13 21:49:32 2020 UTC ()
revert my change for now

Was able to reproduce the hang again. Working on reduced test case.


(tnn)
diff -r1.155 -r1.156 pkgsrc/lang/rust/Makefile
cvs diff -r1.155 -r1.156 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/03/13 18:34:53 1.155
+++ pkgsrc/lang/rust/Makefile 2020/03/13 21:49:32 1.156
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.155 2020/03/13 18:34:53 jperkin Exp $ 1# $NetBSD: Makefile,v 1.156 2020/03/13 21:49:32 tnn Exp $
2 2
3DISTNAME= rustc-1.42.0-src 3DISTNAME= rustc-1.42.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
@@ -120,27 +120,27 @@ CONFIGURE_ARGS+= --debuginfo-level-rustc @@ -120,27 +120,27 @@ CONFIGURE_ARGS+= --debuginfo-level-rustc
120CONFIGURE_ARGS+= --debuginfo-level-std=0 120CONFIGURE_ARGS+= --debuginfo-level-std=0
121CONFIGURE_ARGS+= --debuginfo-level-tools=0 121CONFIGURE_ARGS+= --debuginfo-level-tools=0
122CONFIGURE_ARGS+= --debuginfo-level-tests=0 122CONFIGURE_ARGS+= --debuginfo-level-tests=0
123.endif 123.endif
124 124
125# Only build the ARM target on/for this host, due to resource constraints 125# Only build the ARM target on/for this host, due to resource constraints
126# (X86 needs to go along due to 2-stage build process) 126# (X86 needs to go along due to 2-stage build process)
127.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \ 127.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \
128 !empty(TARGET:Marmv7-unknown-netbsd-eabihf) 128 !empty(TARGET:Marmv7-unknown-netbsd-eabihf)
129CONFIGURE_ARGS+= --set llvm.targets="ARM;X86" 129CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
130.endif 130.endif
131 131
132# toolchain/54192, induces rtld issues 132# toolchain/54192, induces rtld issues
133.if ${OPSYS} == "NetBSD" && (defined(BATCH) || ${PKG_DEVELOPER:Uno} == "no") 133.if ${OPSYS} == "NetBSD"
134MAKE_JOBS_SAFE= no 134MAKE_JOBS_SAFE= no
135.endif 135.endif
136 136
137# 137#
138# Under NetBSD, do not use DT_RUNPATH 138# Under NetBSD, do not use DT_RUNPATH
139# 139#
140BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags 140BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
141 141
142.PHONY: pre-build-fix 142.PHONY: pre-build-fix
143# 143#
144# Rust unfortunately requires itself to build. On platforms which aren't 144# Rust unfortunately requires itself to build. On platforms which aren't
145# supported by upstream (where they offer binary bootstraps), or where we do 145# supported by upstream (where they offer binary bootstraps), or where we do
146# not trust random binaries from the Internet, we need to build and provide our 146# not trust random binaries from the Internet, we need to build and provide our