diff options
| author | nia <nia@pkgsrc.org> | 2020-06-14 15:33:27 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-06-14 15:33:27 +0000 |
| commit | 6126f20f213effac25d2b477408cb022d7795aae (patch) | |
| tree | 883c3889f85a9a0b583726a3b6ffaa4cf9123229 /net | |
| parent | 8ee5b232965adfd9937fc7cf874314933b58a950 (diff) | |
| download | pkgsrc-6126f20f213effac25d2b477408cb022d7795aae.tar.gz | |
Rename rust-bin's PKGNAME to rust-bin. Add rust.mk for rust packages.
This allows rust-bin and rust to coexist in bulk builds (for testing, etc),
but the packages still may not be installed at the same time.
rust.mk as a solution for picking the correct rust variant was suggested
by gdt@. It is intended to be included directly by packages that do not
use cargo.mk, and indirectly by packages that do use cargo.mk.
rust.mk provides one user-settable variable:
RUST_TYPE
as before, whether to bootstrap rust from source or use
official binaries. may be "src" or "bin"
And two package-settable variables:
RUST_REQ
the minimum version of Rust required by the package.
defaults to "1.20.0"
RUST_RUNTIME
whether Rust is a runtime dependency, may be "yes" or "no"
Diffstat (limited to 'net')
| -rw-r--r-- | net/tor/options.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tor/options.mk b/net/tor/options.mk index 548a6f58a2f..f4c88c5f843 100644 --- a/net/tor/options.mk +++ b/net/tor/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2020/05/15 16:39:34 wiz Exp $ +# $NetBSD: options.mk,v 1.12 2020/06/14 15:33:28 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tor PKG_SUPPORTED_OPTIONS= doc rust @@ -33,10 +33,8 @@ CARGO_CRATE_DEPENDS+= rand-0.5.0-pre.2 CARGO_CRATE_DEPENDS+= rand_core-0.2.0-pre.0 CARGO_CRATE_DEPENDS+= typenum-1.9.0 +RUST_REQ= 1.34.0 .include "../../lang/rust/cargo.mk" -BUILDLINK_DEPMETHOD.rust= build -BUILDLINK_API_DEPENDS.rust+= rust>=1.34.0 -.include "../../lang/rust/buildlink3.mk" pre-configure: cd ${WRKSRC} && ${MKDIR} -p src/rust/target/release |