Mon Nov 16 08:25:40 2020 UTC ()
tor: add upstream bug report URL about building problem with rust enabled


(wiz)
diff -r1.13 -r1.14 pkgsrc/net/tor/options.mk
cvs diff -r1.13 -r1.14 pkgsrc/net/tor/options.mk (expand / switch to unified diff)

--- pkgsrc/net/tor/options.mk 2020/11/12 22:56:00 1.13
+++ pkgsrc/net/tor/options.mk 2020/11/16 08:25:40 1.14
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: options.mk,v 1.13 2020/11/12 22:56:00 wiz Exp $ 1# $NetBSD: options.mk,v 1.14 2020/11/16 08:25:40 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tor 3PKG_OPTIONS_VAR= PKG_OPTIONS.tor
4PKG_SUPPORTED_OPTIONS= doc # rust 4PKG_SUPPORTED_OPTIONS= doc # rust
5PKG_SUGGESTED_OPTIONS+= doc 5PKG_SUGGESTED_OPTIONS+= doc
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= doc 9PLIST_VARS+= doc
10 10
11### 11###
12### This enables the build of manual pages. It requires asciidoc 12### This enables the build of manual pages. It requires asciidoc
13### at build time, which comes with a tail of dependencies and 13### at build time, which comes with a tail of dependencies and
14### may not be wanted under certain circumstances. 14### may not be wanted under certain circumstances.
15### 15###
16.if !empty(PKG_OPTIONS:Mdoc) 16.if !empty(PKG_OPTIONS:Mdoc)
17BUILD_DEPENDS+= asciidoc>=8.3.3:../../textproc/asciidoc 17BUILD_DEPENDS+= asciidoc>=8.3.3:../../textproc/asciidoc
18CONFIGURE_ARGS+= --enable-asciidoc 18CONFIGURE_ARGS+= --enable-asciidoc
19PLIST.doc= yes 19PLIST.doc= yes
20.else 20.else
21CONFIGURE_ARGS+= --disable-asciidoc 21CONFIGURE_ARGS+= --disable-asciidoc
22.endif 22.endif
23 23
24### This enables building tor with rust as per 24### This enables building tor with rust as per
25### https://trac.torproject.org/projects/tor/wiki/RustInTor 25### https://trac.torproject.org/projects/tor/wiki/RustInTor
26### XXX: 26### XXX:
27### As of 0.4.4.6 I am not sure how this is supposed to work. 27### As of 0.4.4.6 I am not sure how this is supposed to work.
 28### https://gitlab.torproject.org/tpo/core/tor/-/issues/40191
28.if !empty(PKG_OPTIONS:Mrust) 29.if !empty(PKG_OPTIONS:Mrust)
29CONFIGURE_ENV+= TOR_RUST_DEPENDENCIES=${WRKDIR}/vendor 30CONFIGURE_ENV+= TOR_RUST_DEPENDENCIES=${WRKDIR}/vendor
30CONFIGURE_ARGS+= --enable-rust 31CONFIGURE_ARGS+= --enable-rust
31CARGO_CRATE_DEPENDS+= digest-0.7.2 32CARGO_CRATE_DEPENDS+= digest-0.7.2
32CARGO_CRATE_DEPENDS+= generic-array-0.9.0 33CARGO_CRATE_DEPENDS+= generic-array-0.9.0
33CARGO_CRATE_DEPENDS+= libc-0.2.39 34CARGO_CRATE_DEPENDS+= libc-0.2.39
34CARGO_CRATE_DEPENDS+= rand-0.5.0-pre.2 35CARGO_CRATE_DEPENDS+= rand-0.5.0-pre.2
35CARGO_CRATE_DEPENDS+= rand_core-0.2.0-pre.0 36CARGO_CRATE_DEPENDS+= rand_core-0.2.0-pre.0
36CARGO_CRATE_DEPENDS+= typenum-1.9.0 37CARGO_CRATE_DEPENDS+= typenum-1.9.0
37 38
38RUST_REQ= 1.34.0 39RUST_REQ= 1.34.0
39.include "../../lang/rust/cargo.mk" 40.include "../../lang/rust/cargo.mk"
40 41