Received: by mail.netbsd.org (Postfix, from userid 605) id 31FD684D79; Sat, 13 Jun 2020 13:15:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AE81084D5E for ; Sat, 13 Jun 2020 13:15:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id l75sLYw_ckpg for ; Sat, 13 Jun 2020 13:15:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 39CED84CE2 for ; Sat, 13 Jun 2020 13:15:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2D3CBFB27; Sat, 13 Jun 2020 13:15:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592054144249940" MIME-Version: 1.0 Date: Sat, 13 Jun 2020 13:15:44 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200613131544.2D3CBFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1592054144249940 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1592054144249940 Content-Disposition: inline Content-Length: 1312 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1592054144249940--