View | Details | Raw Unified | Return to bug 210389
Collapse All | Expand All

(-)b/security/tor/Makefile (-25 / +1 lines)
Lines 23-36 CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \ Link Here
23
		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
23
		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
24
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
24
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
25
25
26
OPTIONS_DEFINE=	BUFFEREVENTS INSTR_DOWNLOADS \
26
OPTIONS_DEFINE=	STATIC_TOR TCMALLOC TRANSPARENT
27
		STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
28
27
29
BUFFEREVENTS_DESC=	Use libevent's buffered IO
30
INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
31
STATIC_TOR_DESC=	Build a static tor
28
STATIC_TOR_DESC=	Build a static tor
32
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
29
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
33
TOR2WEB_DESC=		Faster but non-anonymous hidden services
34
TRANSPARENT_DESC=	Transparent proxy support
30
TRANSPARENT_DESC=	Transparent proxy support
35
31
36
OPTIONS_DEFAULT=	THREADS TRANSPARENT
32
OPTIONS_DEFAULT=	THREADS TRANSPARENT
Lines 58-90 CONFIGURE_ARGS+= --enable-gcc-hardening Link Here
58
CONFIGURE_ARGS+=	--disable-gcc-hardening
54
CONFIGURE_ARGS+=	--disable-gcc-hardening
59
.endif
55
.endif
60
56
61
.if ${PORT_OPTIONS:MBUFFEREVENTS}
62
CONFIGURE_ARGS+=	--enable-bufferevents
63
.else
64
CONFIGURE_ARGS+=	--disable-bufferevents
57
CONFIGURE_ARGS+=	--disable-bufferevents
65
.endif
66
67
.if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
68
CONFIGURE_ARGS+=	--enable-instrument-downloads
69
.else
70
CONFIGURE_ARGS+=	--disable-instrument-downloads
58
CONFIGURE_ARGS+=	--disable-instrument-downloads
71
.endif
72
59
73
.if ${PORT_OPTIONS:MSTATIC_TOR}
60
.if ${PORT_OPTIONS:MSTATIC_TOR}
74
BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
61
BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
75
CONFIGURE_ARGS+=	--enable-static-tor \
62
CONFIGURE_ARGS+=	--enable-static-tor \
76
			--with-zlib-dir=/usr/lib --disable-linker-hardening
63
			--with-zlib-dir=/usr/lib --disable-linker-hardening
77
TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
64
TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
78
.if ${PORT_OPTIONS:MBUFFEREVENTS}
79
TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
80
.endif
81
.else
65
.else
82
CONFIGURE_ARGS+=	--enable-linker-hardening
66
CONFIGURE_ARGS+=	--enable-linker-hardening
83
LIB_DEPENDS+=		libevent.so:devel/libevent2
67
LIB_DEPENDS+=		libevent.so:devel/libevent2
84
TOR_LIBEVENT_LIBS=	-levent
68
TOR_LIBEVENT_LIBS=	-levent
85
.if ${PORT_OPTIONS:MBUFFEREVENTS}
86
TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
87
.endif
88
.endif
69
.endif
89
70
90
.if ${PORT_OPTIONS:MTCMALLOC}
71
.if ${PORT_OPTIONS:MTCMALLOC}
Lines 96-105 LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools Link Here
96
.endif
77
.endif
97
.endif
78
.endif
98
79
99
.if ${PORT_OPTIONS:MTOR2WEB}
100
CONFIGURE_ARGS+=	--enable-tor2web-mode
101
.endif
102
103
.if ${PORT_OPTIONS:MTRANSPARENT}
80
.if ${PORT_OPTIONS:MTRANSPARENT}
104
CONFIGURE_ARGS+=	--enable-transparent
81
CONFIGURE_ARGS+=	--enable-transparent
105
.else
82
.else
106
- 

Return to bug 210389