update uclibc++ to 0.1.11 (fixes kismet issues) and remove some kismet workarounds

SVN-Revision: 1339

diff --git a/openwrt/package/kismet/patches/110-uclibc++_fixes.patch b/openwrt/package/kismet/patches/110-uclibc++_fixes.patch
index d27bca07b3e4bc3f0148916181ff98846fee0773..4cf5a7b5b53a1d7cabfb18365e8d676835c83659 100644 (file)
--- a/openwrt/package/kismet/patches/110-uclibc++_fixes.patch
+++ b/openwrt/package/kismet/patches/110-uclibc++_fixes.patch
@@ -27,27 +27,3 @@ diff -urN kismet-2005-04-R1.old/macaddr.h kismet-2005-04-R1.dev/macaddr.h
              return (singleton_itr != op.singleton_itr) || (vector_itr != op.vector_itr);
          }
  
-diff -urN kismet-2005-04-R1.old/tcpserver.cc kismet-2005-04-R1.dev/tcpserver.cc
---- kismet-2005-04-R1.old/tcpserver.cc 2005-04-03 07:33:42.000000000 +0200
-+++ kismet-2005-04-R1.dev/tcpserver.cc 2005-06-08 23:17:34.000000000 +0200
-@@ -373,7 +373,7 @@
-                 return 0;
-             }
-         } else {
--            copt->wrbuf.erase(0, res);
-+            copt->wrbuf = "";
-       }
-     }
- 
-diff -urN kismet-2005-04-R1.old/tcpclient.cc kismet-2005-04-R1.dev/tcpclient.cc
---- kismet-2005-04-R1.old/tcpclient.cc 2005-04-03 07:33:42.000000000 +0200
-+++ kismet-2005-04-R1.dev/tcpclient.cc 2005-07-01 16:42:33.000000000 +0200
-@@ -214,7 +214,7 @@
-                 return(-1);
-             }
-         } else {
--            writebuf.erase(0, res);
-+            writebuf = "";
-         }
-     }
- 

diff --git a/openwrt/package/uclibc++/Makefile b/openwrt/package/uclibc++/Makefile
index 6cc0ceb596931623569f22e4c93a5c4e66442465..0e39d5a8562df8458f669cbfb758eba243077d03 100644 (file)
--- 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 91229cd14f80902fd5615e9e0a4476ec8ff7d4d9..cc9eb49fc48c0ee02647a074089f5ec7898f48b1 100644 (file)
--- 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