diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2021-07-12 12:56:13 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2021-07-12 12:56:13 +0000 |
| commit | 95df95d59bc991bf800c6220cc0662a846f943a1 (patch) | |
| tree | 18dabb65452dc4e62ffd36b44095908054b20d5d | |
| parent | f82aebe168b8a07eab7aecb122e2ae710d2032a0 (diff) | |
| download | pkgsrc-95df95d59bc991bf800c6220cc0662a846f943a1.tar.gz | |
Pullup ticket #6486 - requested by he
lang/rust: build fix
Revisions pulled up:
- lang/rust/Makefile 1.242
- lang/rust/options.mk 1.15
---
Module Name: pkgsrc
Committed By: he
Date: Sun Jul 11 22:13:38 UTC 2021
Modified Files:
pkgsrc/lang/rust: Makefile options.mk
Log Message:
Evidently, cmake is needed in all cases.
Move cmake dependency out of condition on PKG_OPTIONS.rust-llvm.
| -rw-r--r-- | lang/rust/Makefile | 4 | ||||
| -rw-r--r-- | lang/rust/options.mk | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 99b0670d1dc..3010f2977b5 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.241 2021/06/13 12:19:16 he Exp $ +# $NetBSD: Makefile,v 1.241.2.1 2021/07/12 12:56:13 bsiegert Exp $ DISTNAME= rustc-1.52.1-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -594,6 +594,8 @@ BUILD_DEPENDS+= compat80>=0:../../emulators/compat80 DEPENDS+= libatomic-links>=0:../../devel/libatomic-links .endif +BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake +.include "../../devel/cmake/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/rust/options.mk b/lang/rust/options.mk index c5718ead82a..cb6fccc4517 100644 --- a/lang/rust/options.mk +++ b/lang/rust/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2021/04/04 08:51:20 he Exp $ +# $NetBSD: options.mk,v 1.14.2.1 2021/07/12 12:56:13 bsiegert Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rust PKG_SUPPORTED_OPTIONS+= rust-cargo-static @@ -26,10 +26,7 @@ PKG_SUGGESTED_OPTIONS+= rust-cargo-static # Use the internal copy of LLVM. # This contains some extra optimizations. # -.if !empty(PKG_OPTIONS:Mrust-llvm) -BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake -.include "../../devel/cmake/buildlink3.mk" -.else +.if empty(PKG_OPTIONS:Mrust-llvm) .include "../../lang/llvm/buildlink3.mk" CONFIGURE_ARGS+= --enable-llvm-link-shared CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} |