From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 21 Mar 2010 16:14:08 +0000 (+0000)
Subject: [package] link dibbler-server against libstdc++, does not work with uclibc++ (#6905)
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=d0364ff5c3d8c6c6c057f1cd3571e5dfcd0b343b;p=packages.git

[package] link dibbler-server against libstdc++, does not work with uclibc++ (#6905)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@20351 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/ipv6/dibbler/Makefile b/ipv6/dibbler/Makefile
index d723e018f..09ddecb8e 100644
--- a/ipv6/dibbler/Makefile
+++ b/ipv6/dibbler/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dibbler
 PKG_VERSION:=0.7.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=http://klub.com.pl/dhcpv6/dibbler/
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/dibbler/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+uclibcxx @LINUX_2_6 +libpthread
+  DEPENDS:=+libstdcpp @LINUX_2_6 +libpthread
   TITLE:=Dibbler, a portable DHCPv6 implementation
   URL:=http://klub.com.pl/dhcpv6/
 endef
@@ -106,12 +106,12 @@ define Build/Configure
 endef
 
 # link stuff missing from uClibc++ but present in stdc++ statically
-CXX_LIBS:= -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lgcc
+CXX_LIBS:= -lstdc++ -lm -lgcc
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		PORT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -fno-builtin" \
+		PORT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 		PORT_LDFLAGS="$(TARGET_LDFLAGS)" \
 		DEBUGINFO= \
 		CXXLD="$(TARGET_CC)" \