tweak tor Makefile and remove unneeded intrusive patch

[openwrt/svn-archive/archive.git] / net / tor / Makefile

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 595b3c108923447197eb1c632923f0cddb1dd60d..987bdd43e1ad73e94793b934733c5347fce2021a 100644 (file)
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -79,22 +79,15 @@ fi
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); touch \
-               configure.in \
-               aclocal.m4 \
-               Makefile.in \
-               configure \
-       );
        $(call Build/Configure/Default,\
-               --with-libevent-dir="$(STAGING_DIR)/usr/" \
-               --with-gnu-ld \
+               --with-libevent-dir="$(STAGING_DIR)/usr" \
+               --with-ssl-dir="$(STAGING_DIR)/usr" \
                , \
-               ac_cv_libevent_normal=yes \
-               ac_cv_openssldir="$(STAGING_DIR)/usr" \
+               ac_cv_libevent_linker_option='(none)' \
+               ac_cv_openssl_linker_option='(none)' \
                tor_cv_null_is_zero=yes \
                tor_cv_unaligned_ok=yes \
                tor_cv_time_t_signed=yes \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -levent" \
        )
 endef