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

[packages] vncrepeater libc++ fix

SVN-Revision: 32980
---

diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile
index c48ecff9ed..e1f89ff300 100644
--- a/net/vncrepeater/Makefile
+++ b/net/vncrepeater/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vncrepeater
 PKG_VERSION:=0.12
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.rit.edu/~reh5586/openwrt/packages/vncrepeater/src
@@ -17,12 +17,13 @@ PKG_MD5SUM:=5951740a8a103d7d9668558b3639c6c4
 
 PKG_BUILD_PARALLEL:=1
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vncrepeater
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx
+  DEPENDS:=$(CXX_DEPENDS)
   TITLE:=UltraVNC repeater for Linux
   URL:=http://www.uvnc.com/addons/repeater.html
 endef
@@ -42,8 +43,8 @@ endef
 
 define Build/Compile
 	$(call Build/Compile/Default, \
-		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \
-		LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc -luClibc++ -lc $(LIBGCC_S)" \
+		CC="$(TARGET_CXX)" \
+		CFLAGS="$(TARGET_CPPFLAGS) -fno-rtti" \
 		repeater \
 	)
 endef