summaryrefslogtreecommitdiff
path: root/lang/rust
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2020-01-19 20:46:40 +0000
committermaya <maya@pkgsrc.org>2020-01-19 20:46:40 +0000
commitd65443e8dcbc0f7ca388daa001bb03533d20b036 (patch)
tree755a0298b7f52e3b38403183bba4d6a2b30b42f2 /lang/rust
parentf55a198a535004e7a198cd6f7a9c04cb844d6b07 (diff)
downloadpkgsrc-d65443e8dcbc0f7ca388daa001bb03533d20b036.tar.gz
rust: mark MAKE_JOBS_SAFE=no on NetBSD.
PR pkg/54795
Diffstat (limited to 'lang/rust')
-rw-r--r--lang/rust/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 43ddec9548c..a0b9cb5a60e 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2020/01/18 21:49:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.138 2020/01/19 20:46:40 maya Exp $
DISTNAME= rustc-1.40.0-src
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -98,7 +98,7 @@ PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
CONFIGURE_ARGS+= --enable-vendor
# cargo defaults to using the number of available CPUs
-MAKE_ENV+= CARGO_BUILD_JOBS=${MAKE_JOBS:U1}
+MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
@@ -135,6 +135,10 @@ CONFIGURE_ARGS+= --debuginfo-level-tests=0
CONFIGURE_ARGS+= --set llvm.targets="ARM;X86"
.endif
+# toolchain/54192, induces rtld issues
+.if ${OPSYS} == "NetBSD"
+MAKE_JOBS_SAFE= no
+.endif
#
# Under NetBSD, do not use DT_RUNPATH
@@ -351,12 +355,12 @@ pre-build: pre-build-fix
do-build:
cd ${WRKSRC} \
&& ${SETENV} ${MAKE_ENV} \
- ${PYTHONBIN} ./x.py -v ${BUILD_TARGET} -j ${MAKE_JOBS:U1}
+ ${PYTHONBIN} ./x.py -v ${BUILD_TARGET} -j ${_MAKE_JOBS_N}
do-install:
cd ${WRKSRC} \
&& ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
- ${PYTHONBIN} ./x.py -v install -j ${MAKE_JOBS:U1}
+ ${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N}
GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;