From: John Crispin <john@openwrt.org>
Date: Sat, 4 Aug 2012 17:02:11 +0000 (+0000)
Subject: [packages] dansguardian libc++ fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=226a55a495a48ce0fdac3050b171c150fc0ccadb;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] dansguardian libc++ fix

SVN-Revision: 32982
---

diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile
index b3322aba3c..bba2d8b799 100644
--- a/net/dansguardian/Makefile
+++ b/net/dansguardian/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dansguardian
 PKG_VERSION:=2.10.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable
@@ -17,11 +17,12 @@ PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a
 
 PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dansguardian
   SECTION:=net
-  DEPENDS:=+libpthread +uclibcxx +zlib
+  DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
   TITLE:=DansGuardian
@@ -34,10 +35,8 @@ endef
 
 CONFIGURE_VARS += \
 	INCLUDES="" \
-	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="-nodefaultlibs -lc -luClibc++ -lpthread $(LIBGCC_S)" \
+	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
+	LIBS="-lpthread" \
 
 define Build/Configure
 	$(call Build/Configure/Default,\