diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-01-04 04:00:39 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-01-04 04:00:39 +0000 |
| commit | 076bf84a1c8e1499b7bb4fdedad8d771a8f920c4 (patch) | |
| tree | 3049456d529f79440c8add089be17f3450b2e993 /Mk | |
| parent | - Update to 8.6.5 (diff) | |
Allow overriding rust dependency
Add DEFAULT_VERSIONS+=rust=rust-nightly to make.conf(5) if you want to
build consumers using lang/rust-nightly.
Approved by: rust (tobik)
MFH: 2019Q1 (avoid merge conflicts during www/firefox updates)
Differential Revision: https://reviews.freebsd.org/D18634
Notes
Notes:
svn path=/head/; revision=489241
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/cargo.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.gecko.mk | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index d9d989ddeb97..18ebcadd52c6 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -46,7 +46,7 @@ DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g} CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= rust>=1.31.0:lang/rust +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.31.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 4f7695204eb9..7c2154ef5050 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -88,6 +88,8 @@ PYTHON2_DEFAULT?= 2.7 PYTHON3_DEFAULT?= 3.6 # Possible values: 2.3, 2.4, 2.5 RUBY_DEFAULT?= 2.4 +# Possible values: rust, rust-nightly +RUST_DEFAULT?= rust # Possible values: 4.6, 4.7, 4.8 SAMBA_DEFAULT?= 4.7 # Possible values: base, openssl, openssl111, libressl, libressl-devel diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 5eeaafd6843a..bc349a4862c5 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -339,8 +339,7 @@ post-patch-SNDIO-on: .endif .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54 -BUILD_DEPENDS+= ${RUST_PORT:T}>=1.29:${RUST_PORT} -RUST_PORT?= lang/rust +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.29:lang/${RUST_DEFAULT} . if ${MOZILLA_VER:R:R} < 54 MOZ_OPTIONS+= --enable-rust . endif |