make gcc4 depend on libgcc, and disable the libgcc hack for it

[openwrt.git] / openwrt / package / tor / Makefile

diff --git a/openwrt/package/tor/Makefile b/openwrt/package/tor/Makefile
index 2ffc31a..d961f37 100644 (file)
--- a/openwrt/package/tor/Makefile
+++ b/openwrt/package/tor/Makefile
@@ -3,18 +3,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor
-PKG_VERSION:=0.1.0.9rc
+PKG_VERSION:=0.1.0.16
 PKG_RELEASE:=1
-PKG_UPSTREAM_VERSION=0.1.0.9-rc
-PKG_MD5SUM:=ebfc42e3f168621434992065519e3990
+PKG_MD5SUM:=13631507b8eeee5d6e8fd245dc3eef4f
 
 PKG_SOURCE_URL:=http://tor.eff.org/dist/ \
        http://ftp.se.linux.org/crypto/tor/ \
        http://tor.meulie.net/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -71,7 +70,7 @@ $(IPKG_TOR):
        install -d -m0755 $(IDIR_TOR)/etc/tor
        install -m0644 ./files/torrc $(IDIR_TOR)/etc/tor/torrc
        install -d -m0755 $(IDIR_TOR)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tor $(IDIR_TOR)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tor $(IDIR_TOR)/usr/sbin/
        $(RSTRIP) $(IDIR_TOR)
        $(IPKG_BUILD) $(IDIR_TOR) $(PACKAGE_DIR)