Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/rust rust: fix building on FreeBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d48f5a50adb6
branches:  trunk
changeset: 432669:d48f5a50adb6
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Sun May 24 06:51:24 2020 +0000

description:
rust: fix building on FreeBSD

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

diffstat:

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

diffs (29 lines):

diff -r 0a23c005a9a7 -r d48f5a50adb6 lang/rust/Makefile
--- a/lang/rust/Makefile        Sun May 24 06:30:24 2020 +0000
+++ b/lang/rust/Makefile        Sun May 24 06:51:24 2020 +0000
@@ -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 @@
 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+=       --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
 



Home | Main Index | Thread Index | Old Index