[packages] imsnif libc++ fix

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

diff --git a/net/imsnif/Makefile b/net/imsnif/Makefile
index b102486..35eb64f 100644 (file)
--- a/net/imsnif/Makefile
+++ b/net/imsnif/Makefile
@@ -9,12 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imsnif
 PKG_VERSION:=0.04
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=@SF/im-snif
 PKG_SOURCE:=$(PKG_NAME)f_$(PKG_VERSION).tgz
 PKG_MD5SUM:=689c456f8edb77b9b4199a25514ac683
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) -xvf -
@@ -23,7 +24,7 @@ define Package/imsnif
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Instant Messaging
-  DEPENDS:=+libpcap +uclibcxx
+  DEPENDS:=+libpcap $(CXX_DEPENDS)
   TITLE:=MSN Messenger sniffer
   URL:=http://sourceforge.net/projects/im-snif
 endef
@@ -35,14 +36,13 @@ define Package/imsnif/description
 endef
 
 define Build/Compile
-       $(TARGET_CROSS)g++ $(TARGET_CPPFLAGS) -fno-builtin -fno-rtti -nostdinc++ \
-               -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include \
+       $(TARGET_CXX) $(TARGET_CPPFLAGS) -fno-rtti -I$(LINUX_DIR)/include \
                -o $(PKG_BUILD_DIR)/src/imsnif \
                        $(PKG_BUILD_DIR)/src/imsniff.cpp \
                        $(PKG_BUILD_DIR)/src/util.cpp \
                        $(PKG_BUILD_DIR)/src/msn_conntrack.cpp \
                        $(PKG_BUILD_DIR)/src/msn_handlers.cpp \
-               -L$(STAGING_DIR)/usr/lib -nodefaultlibs -lc -luClibc++ $(LIBGCC_S) -lpcap \
+               -L$(STAGING_DIR)/usr/lib -lpcap \
                        $(PKG_BUILD_DIR)/src/pcap_stuff.cpp
 endef