diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-10-17 08:39:13 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-10-17 08:39:13 +0000 |
| commit | d16d745a5d4bbbffdacd4159ab96ee2ef0d0c520 (patch) | |
| tree | b48ba37a8aea7d4b9080d9481d4f505cff3e6cef /lang | |
| parent | 6fb8193f5444a4ea5a33d382c4ace240bf64c75b (diff) | |
| download | pkgsrc-d16d745a5d4bbbffdacd4159ab96ee2ef0d0c520.tar.gz | |
*: Replace custom tool setup with new ggrep.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/compiler-rt/Makefile | 10 | ||||
| -rw-r--r-- | lang/rust/Makefile | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/lang/compiler-rt/Makefile b/lang/compiler-rt/Makefile index 43f1e12c77b..8e039bcd481 100644 --- a/lang/compiler-rt/Makefile +++ b/lang/compiler-rt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/08/10 15:57:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= compiler-rt-6.0.1.src PKGNAME= ${DISTNAME:S/.src//} @@ -13,6 +13,7 @@ LICENSE= modified-bsd OR mit USE_LANGUAGES= c99 c++11 USE_CMAKE= yes +USE_TOOLS+= ggrep GCC_REQD+= 4.8 SSP_SUPPORTED= no @@ -40,13 +41,6 @@ PYTHON_FOR_BUILD_ONLY= yes post-extract: ${RUN} mkdir -p ${WRKDIR}/build -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= grep>=0:../../textproc/grep -TOOLS_PATH.grep= ${PREFIX}/bin/ggrep -.endif - .include "../../devel/googletest/buildlink3.mk" .include "../../lang/llvm/buildlink3.mk" .include "../../lang/python/tool.mk" diff --git a/lang/rust/Makefile b/lang/rust/Makefile index f77b0c3d5bf..c371ff34c01 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/10/15 11:22:23 he Exp $ +# $NetBSD: Makefile,v 1.59 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= rustc-1.29.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 gmake perl:build pkg-config +USE_TOOLS+= bash ggrep gmake perl:build pkg-config # For internal llvm BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake @@ -230,9 +230,7 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap .endif .if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= grep>=0:../../textproc/grep BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils -TOOLS_PATH.grep= ${PREFIX}/bin/ggrep TOOLS_CREATE+= md5sum TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum .endif |