summaryrefslogtreecommitdiff
path: root/www/firefox68
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-06-14 15:33:27 +0000
committernia <nia@pkgsrc.org>2020-06-14 15:33:27 +0000
commit6126f20f213effac25d2b477408cb022d7795aae (patch)
tree883c3889f85a9a0b583726a3b6ffaa4cf9123229 /www/firefox68
parent8ee5b232965adfd9937fc7cf874314933b58a950 (diff)
downloadpkgsrc-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 'www/firefox68')
-rw-r--r--www/firefox68/mozilla-common.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index bfdcb3dc3ff..bb7adaf86c5 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.10 2020/04/28 06:56:48 riastradh Exp $
+# $NetBSD: mozilla-common.mk,v 1.11 2020/06/14 15:33:28 nia Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -227,9 +227,8 @@ BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2
.include "../../graphics/libwebp/buildlink3.mk"
BUILDLINK_DEPMETHOD.clang= build
.include "../../lang/clang/buildlink3.mk"
-BUILDLINK_DEPMETHOD.rust= build
-BUILDLINK_API_DEPENDS.rust+= rust>=1.34.0
-.include "../../lang/rust/buildlink3.mk"
+RUST_REQ= 1.34.0
+.include "../../lang/rust/rust.mk"
# webrtc option requires internal libvpx
#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
#.include "../../multimedia/libvpx/buildlink3.mk"