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

[packages] ndppd libc++ fix

SVN-Revision: 32985
---

diff --git a/ipv6/ndppd/Makefile b/ipv6/ndppd/Makefile
index 7d37384be9..8ffcacb69c 100644
--- a/ipv6/ndppd/Makefile
+++ b/ipv6/ndppd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ndppd
 PKG_VERSION:=0.2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
@@ -22,6 +22,7 @@ PKG_MD5SUM:=d90c4b65777a62274c1837dba341e5a8
 #PKG_SOURCE_VERSION=master
 #PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ndppd
@@ -30,7 +31,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <kerneis@pps.jussieu.fr>
-  DEPENDS:=+kmod-ipv6 +uclibcxx
+  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description
@@ -51,11 +52,9 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CXX="$(TARGET_CXX)" \
-		CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) $(TARGET_CFLAGS) \
-		-std=c++0x -fno-builtin -fno-rtti -nostdinc++ \
-		-I$(STAGING_DIR)/usr/include/uClibc++" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++0x -fno-rtti" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		LIBS="-nodefaultlibs -lc -luClibc++ $(LIBGCC_S)" \
+		LIBS="-lc" \
 		ndppd
 endef