From cc253ba393998e16ca7d2b9a5d4760f125d1b2ae Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Sat, 4 Aug 2012 17:02:03 +0000
Subject: [PATCH] [packages] avrusbboot libc++ fix

SVN-Revision: 32977
---
 utils/avrusbboot/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/avrusbboot/Makefile b/utils/avrusbboot/Makefile
index 378b07655f..2d3eb214fa 100644
--- a/utils/avrusbboot/Makefile
+++ b/utils/avrusbboot/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avrusbboot
 PKG_VERSION:=2006-06-25
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.fischl.de/avrusbboot/
@@ -17,12 +17,13 @@ PKG_MD5SUM:=3e2f5e2c257918410a66c3463f583fdf
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/avrusbboot
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libusb +uclibcxx
+  DEPENDS:=+libusb $(CXX_DEPENDS)
   TITLE:=USB bootloader for Atmel AVR controllers
   URL:=http://www.fischl.de/avrusbboot/
 endef
@@ -40,8 +41,9 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/software \
-		CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++ $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++" \
-		LFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc -luClibc++ -lc -lusb $(LIBGCC_S)" \
+		CXX="$(TARGET_CXX)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) -fno-rtti" \
+		LFLAGS="$(TARGET_LDFLAGS) -lusb" \
 		all
 endef
 
-- 
2.30.2