X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fpeerguardian%2FMakefile;h=9f0335ddb63d6bbb5a2ef615dcfc533757e53332;hb=53077230170bf11548959b8c8eeb70107cc7c32a;hp=36ec034aaa63642a2e23872bd2a5b5c139f9e621;hpb=623a7e282e0a27e689b5718569a108da8d1f1dcb;p=packages.git

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index 36ec034aa..9f0335ddb 100644
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -1,22 +1,22 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=peerguardian
 PKG_VERSION:=1.5beta
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=pglinux-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/peerguardian
 PKG_MD5SUM:=0fb2bc5501b031604fc56eec3bd35fa4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/pglinux-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 
 PKG_BUILD_DEPENDS:=iptables
 
@@ -25,7 +25,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx +libnetfilter-queue +libnfnetlink
+  SUBMENU:=P2P
+  DEPENDS:= +libncurses +libpthread +libnetfilter-queue
   TITLE:=PeerGuardian for Linux
   URL:=http://phoenixlabs.org/
 endef
@@ -40,13 +41,14 @@ define Package/peerguardian/conffiles
 /etc/p2p.p2b.p2p
 endef
 
+EXTRA_CFLAGS:=-fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/
+
 CONFIGURE_VARS+= \
-	CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/" \
-	LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lgcc" \
+	LIBS="-lm"
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CXXLD="$(TARGET_CC)"
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CXXLD="$(TARGET_CXX)"
 endef
 
 define Package/peerguardian/install