summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-04-02 10:29:48 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-04-02 10:29:48 +0200
commita62214e8cfbcb54cf87567063ab2f385468911ab (patch)
tree0ce7b2413edfd10e49da2243af78285dfb5c6c10
parent249612ff266700ceba8d4a1ca53aaf71c7927477 (diff)
backport patch from upstream git
Commit: 82df3e70ac191a2a3cabf3574839e7561e00e370
-rw-r--r--package/tor/Makefile3
-rw-r--r--package/tor/patches/patch-src_test_include_am19
2 files changed, 21 insertions, 1 deletions
diff --git a/package/tor/Makefile b/package/tor/Makefile
index f59f0fff3..cd4b0b91c 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= tor
PKG_VERSION:= 0.2.7.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= 493a8679f904503048114aca6467faef56861206bab8283d858f37141d95105d
PKG_DESCR:= anonymous internet communication system
PKG_SECTION:= net/proxy
@@ -29,6 +29,7 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+AUTOTOOL_STYLE:= autoreconf
# -DNDEBUG not supported
TARGET_CPPFLAGS:=
CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
diff --git a/package/tor/patches/patch-src_test_include_am b/package/tor/patches/patch-src_test_include_am
new file mode 100644
index 000000000..3873b39a9
--- /dev/null
+++ b/package/tor/patches/patch-src_test_include_am
@@ -0,0 +1,19 @@
+--- tor-0.2.7.6.orig/src/test/include.am 2015-12-08 18:35:17.000000000 +0100
++++ tor-0.2.7.6/src/test/include.am 2016-04-02 10:19:12.308964966 +0200
+@@ -124,9 +124,13 @@ src_test_test_workqueue_CFLAGS = $(AM_CF
+
+ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
+ @TOR_LDFLAGS_libevent@
+-src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
+- src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \
+- src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
++src_test_test_LDADD = src/or/libtor-testing.a \
++ src/common/libor-crypto-testing.a \
++ $(LIBKECCAK_TINY) \
++ $(LIBDONNA) \
++ src/common/libor-testing.a \
++ src/common/libor-event-testing.a \
++ src/trunnel/libor-trunnel-testing.a \
+ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
+ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
+ @TOR_SYSTEMD_LIBS@