CVS commit: pkgsrc/lang/rust

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jan 19 20:46:40 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
rust: mark MAKE_JOBS_SAFE=no on NetBSD.
PR pkg/54795


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/lang/rust/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.137 pkgsrc/lang/rust/Makefile:1.138
--- pkgsrc/lang/rust/Makefile:1.137     Sat Jan 18 21:49:44 2020
+++ pkgsrc/lang/rust/Makefile   Sun Jan 19 20:46:40 2020
@@ -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
 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
 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} ;