diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/tor | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/tor')
| -rw-r--r-- | package/tor/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/package/tor/Makefile b/package/tor/Makefile index 7c57f0573..637690c81 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.4.21 PKG_RELEASE:= 1 PKG_MD5SUM:= bde981d10e8faf1e171ef1ebbb7b398a PKG_DESCR:= anonymous internet communication system -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_DEPENDS:= libevent libopenssl zlib libpthread PKG_BUILDDEP:= libevent openssl zlib PKG_URL:= https://www.torproject.org/ @@ -31,7 +31,11 @@ CONFIGURE_ENV+= ac_cv_libevent_normal=yes \ tor_cv_null_is_zero=yes \ tor_cv_unaligned_ok=yes +ifeq ($(ADK_TARGET_USE_SSP),y) +CONFIGURE_ARGS+= --enable-gcc-hardening +else CONFIGURE_ARGS+= --disable-gcc-hardening +endif tor-install: ${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor |