pkgsrc-Changes archive

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

CVS commit: pkgsrc/lang/rust



Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Jun 13 13:15:44 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: Fix MAKE_JOBS_SAFE setting for NetBSD

The previous conditional was never true.  Assume that it meant to
apply to NetBSD <= 9 and not apply to current.  Add comments
explaining the reason, with \todo for aspects that are unclear,
partially rescued from CVS history, and partially from tech-pkg
discussion.


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 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.174 pkgsrc/lang/rust/Makefile:1.175
--- pkgsrc/lang/rust/Makefile:1.174     Tue Jun  9 15:08:24 2020
+++ pkgsrc/lang/rust/Makefile   Sat Jun 13 13:15:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.174 2020/06/09 15:08:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.175 2020/06/13 13:15:44 gdt Exp $
 
 DISTNAME=      rustc-1.43.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -136,10 +136,19 @@ CONFIGURE_ARGS+=  --debuginfo-level-tests
 CONFIGURE_ARGS+=       --set llvm.targets="ARM;X86"
 .endif
 
-.if ${OPSYS} == "NetBSD" && !empty(MACHINE_PLATFORM:MNetBSD-9.99.*) && \
-    !empty(MACHINE_PLATFORM:MNetBSD-[1-9][0-9].*)
+.if ${OPSYS} == "NetBSD"
+# On older versions of NetBSD, parallel builds cause problems.
+# \todo Explain if the build is believed to be sound if not parallel,
+# or if a non-parallel build is merely more likely to work.
+# See toolchain/54192 at
+# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54192
+# \todo Explain if this has been pulled up to 8 and 9, and 
+
+# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
+.if empty(MACHINE_PLATFORM:MNetBSD-9.99.*) && !empty(MACHINE_PLATFORM:MNetBSD-[1-9].*)
 MAKE_JOBS_SAFE=        no
 .endif
+.endif
 
 #
 # Under NetBSD, do not use DT_RUNPATH



Home | Main Index | Thread Index | Old Index