CVS commit: pkgsrc/lang/rust

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun May 24 06:51:24 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
rust: fix building on FreeBSD

pkgsrc changes:
---------------
  * fix grep in USE_TOOLS
  * make parallel building not safe for FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 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.168 pkgsrc/lang/rust/Makefile:1.169
--- pkgsrc/lang/rust/Makefile:1.168     Fri May 22 10:56:15 2020
+++ pkgsrc/lang/rust/Makefile   Sun May 24 06:51:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2020/05/22 10:56:15 adam Exp $
+# $NetBSD: Makefile,v 1.169 2020/05/24 06:51:24 triaxx Exp $
 
 DISTNAME=      rustc-1.43.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -14,7 +14,7 @@ LICENSE=      mit OR apache-2.0
 USE_GCC_RUNTIME=       yes
 USE_LANGUAGES=         c c++11
 USE_LIBTOOL=           yes
-USE_TOOLS+=            bash ggrep gmake perl:build pkg-config
+USE_TOOLS+=            bash grep gmake perl:build pkg-config
 
 # The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
 # build on 7).  Mark earlier versions as broken.
@@ -130,8 +130,8 @@ 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" && !empty(MACHINE_PLATFORM:MNetBSD-9.99.*) && \
+     !empty(MACHINE_PLATFORM:MNetBSD-[1-9][0-9].*)) || ${OPSYS} == "FreeBSD"
 MAKE_JOBS_SAFE=        no
 .endif