From 9e6a57c9d221d44651117319646a6102b0506812 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Jul 2005 19:37:44 +0000
Subject: [PATCH] update uClibc++ to 0.1.11 - fixes kismet problems

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1337 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/package/uclibc++/Makefile        |  6 +++---
 openwrt/package/uclibc++/uclibc++.config | 25 +++++++++++-------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/openwrt/package/uclibc++/Makefile b/openwrt/package/uclibc++/Makefile
index 6cc0ceb59..0e39d5a85 100644
--- a/openwrt/package/uclibc++/Makefile
+++ b/openwrt/package/uclibc++/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uClibc++
-PKG_VERSION:=0.1.9
+PKG_VERSION:=0.1.11
 PKG_RELEASE:=1
-PKG_MD5SUM:=ebf58e04d72eab5c131c2c9118737024
+PKG_MD5SUM:=8a8e0ee8fefef150c08a649fd7da04aa
 
 PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tbz2
@@ -59,7 +59,7 @@ $(STAGING_DIR)/lib/libuClibc++.so: $(PKG_BUILD_DIR)/.built
 $(IPKG_LIBCXX): $(STAGING_DIR)/lib/libuClibc++.so
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBCXX) ./$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBCXX)/usr/lib
-	cp -fpR $(STAGING_DIR)/lib/libuClibc++.so* $(IDIR_LIBCXX)/usr/lib/
+	cp -fpR $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_LIBCXX)/usr/lib/
 	$(STRIP) $(IDIR_LIBCXX)/usr/lib/*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBCXX) $(PACKAGE_DIR)
diff --git a/openwrt/package/uclibc++/uclibc++.config b/openwrt/package/uclibc++/uclibc++.config
index 91229cd14..cc9eb49fc 100644
--- a/openwrt/package/uclibc++/uclibc++.config
+++ b/openwrt/package/uclibc++/uclibc++.config
@@ -12,20 +12,6 @@ TARGET_mips=y
 HAVE_ELF=y
 TARGET_ARCH="mips"
 ARCH_CFLAGS="-mno-split-addresses"
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
 # CONFIG_MIPS_ISA_1 is not set
 # CONFIG_MIPS_ISA_2 is not set
 # CONFIG_MIPS_ISA_3 is not set
@@ -48,17 +34,26 @@ UCLIBCXX_SUPPORT_CDIR=y
 UCLIBCXX_SUPPORT_CIN=y
 UCLIBCXX_SUPPORT_COUT=y
 UCLIBCXX_SUPPORT_CERR=y
+# UCLIBCXX_SUPPORT_CLOG is not set
+# UCLIBCXX_SUPPORT_WCIN is not set
+# UCLIBCXX_SUPPORT_WCOUT is not set
+# UCLIBCXX_SUPPORT_WCERR is not set
+# UCLIBCXX_SUPPORT_WCLOG is not set
 
 #
 # STL and Code Expansion
 #
 UCLIBCXX_STL_BUFFER_SIZE=32
 UCLIBCXX_CODE_EXPANSION=y
+# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
 UCLIBCXX_EXPAND_STRING_CHAR=y
 UCLIBCXX_EXPAND_VECTOR_BASIC=y
+# UCLIBCXX_EXPAND_IOS_CHAR is not set
+# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
 UCLIBCXX_EXPAND_ISTREAM_CHAR=y
 UCLIBCXX_EXPAND_OSTREAM_CHAR=y
 UCLIBCXX_EXPAND_FSTREAM_CHAR=y
+# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
 
 #
 # Library Installation Options
@@ -69,4 +64,6 @@ UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
 UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
 UCLIBCXX_EXCEPTION_SUPPORT=y
 IMPORT_LIBSUP=y
+# IMPORT_LIBGCC_EH is not set
+# BUILD_STATIC_LIB is not set
 # DODEBUG is not set
-- 
2.20.1