pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/rust rust: mark MAKE_JOBS_SAFE=no on NetBSD.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c9b5569823f
branches:  trunk
changeset: 422031:6c9b5569823f
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Jan 19 20:46:40 2020 +0000

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

diffstat:

 lang/rust/Makefile |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r f78462d89ab3 -r 6c9b5569823f lang/rust/Makefile
--- a/lang/rust/Makefile        Sun Jan 19 18:20:45 2020 +0000
+++ b/lang/rust/Makefile        Sun Jan 19 20:46:40 2020 +0000
@@ -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 @@
 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+=       --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 @@
 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} ;



Home | Main Index | Thread Index | Old Index