summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/fltk/Makefile2
-rw-r--r--package/gmediaserver/Makefile3
-rw-r--r--package/gpsd/Makefile5
-rw-r--r--package/nmap/Makefile4
-rw-r--r--package/rtorrent/Makefile2
-rw-r--r--package/uclibc++/Makefile4
-rw-r--r--package/uclibc++/patches/patch-bin_Makefile12
-rw-r--r--package/uclibc++/patches/patch-fstream_eof15
-rw-r--r--package/uclibc++/patches/patch-include_associative_base38
-rw-r--r--package/uclibc++/patches/patch-include_string17
-rw-r--r--package/uclibc++/patches/patch-include_unwind-cxx_h358
-rw-r--r--package/uclibc++/patches/patch-src_string_cpp17
13 files changed, 12 insertions, 467 deletions
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index b24b416b7..c50c849a6 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp
endif
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index d727bb7f6..6be7c539b 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -24,7 +24,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
endif
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index b8eb3ebb5..1cb5ecd80 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= id3lib libupnp libmagic libiconv
PKG_BUILDDEP:= id3lib libupnp file libiconv
PKG_URL:= http://www.gnu.org/software/gmediaserver
PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/
+PKG_CXX:= GMEDIASERVER
include ${TOPDIR}/mk/package.mk
@@ -23,7 +24,7 @@ CONFIGURE_ARGS+= --with-id3lib="${STAGING_TARGET_DIR}/usr" \
--with-libupnp="${STAGING_TARGET_DIR}/usr"
ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
-CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz"
+CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz -lc"
endif
post-install:
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 19cd7c3f2..9666a7c29 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gpsd
PKG_VERSION:= 2.95
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 12535a9ed9fecf9ea2c5bdc9840da5ae
PKG_DESCR:= An interface daemon for GPS receivers
PKG_SECTION:= misc
@@ -34,7 +34,7 @@ CONFIGURE_ENV+= EGREP="grep -E" \
CONFIGURE_ARGS+= --disable-dbus
TARGET_CFLAGS+= -fPIC
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lc
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
endif
@@ -57,6 +57,7 @@ endif
post-install:
${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin
${CP} ${WRKINST}/usr/lib/libgps.so* ${IDIR_GPSD}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libgpsd.so* ${IDIR_GPSD}/usr/lib
${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin
${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin
${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index c26a53c4f..6c8726a32 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= nmap
PKG_VERSION:= 5.00
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886
PKG_DESCR:= utility for network exploration or security auditing
PKG_SECTION:= net
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
endif
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index dac38e6e9..9b453e23d 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 9bc258d7a63dd13e3348f310ae26a434
PKG_DESCR:= console torrent application
PKG_SECTION:= p2p
-PKG_DEPENDS:= libncurses libtorrent libcurl
+PKG_DEPENDS:= libncurses libtorrent libcurl libstdcxx
PKG_BUILDDEP:= ncurses libtorrent curl
PKG_URL:= http://libtorrent.rakshasa.no/
PKG_SITES:= http://libtorrent.rakshasa.no/downloads/
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 0db591b90..6c1097e19 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= uClibc++
-PKG_VERSION:= 0.2.2
+PKG_VERSION:= 0.2.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1ceef3209cca88be8f1bd9de99735954
+PKG_MD5SUM:= 394c119363dd8b469fb898442a6764b8
PKG_DESCR:= A standard c++ library for embedded systems
PKG_SECTION:= libs
PKG_URL:= http://cxx.uclibc.org/
diff --git a/package/uclibc++/patches/patch-bin_Makefile b/package/uclibc++/patches/patch-bin_Makefile
deleted file mode 100644
index 6be4e2b38..000000000
--- a/package/uclibc++/patches/patch-bin_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- uClibc++-0.2.1.orig/bin/Makefile 2006-09-04 04:28:02.000000000 +0200
-+++ uClibc++-0.2.1/bin/Makefile 2009-04-29 19:45:06.704996078 +0200
-@@ -13,7 +13,7 @@ install:
- $(INSTALL) -m 755 $(WRAPPER) $(PREFIX)$(UCLIBCXX_RUNTIME_BINDIR)
-
- $(WRAPPER):
-- echo "#!/bin/bash" > $(WRAPPER)
-+ echo "#!/usr/bin/env bash" > $(WRAPPER)
- echo "" >> $(WRAPPER)
- echo 'WRAPPER_INCLUDEDIR="$${WRAPPER_INCLUDEDIR:=-I$(UCLIBCXX_RUNTIME_INCLUDEDIR)}"' >> $(WRAPPER)
- echo 'WRAPPER_LIBDIR="$${WRAPPER_LIBDIR:=-L$(UCLIBCXX_RUNTIME_LIBDIR)}"' >> $(WRAPPER)
diff --git a/package/uclibc++/patches/patch-fstream_eof b/package/uclibc++/patches/patch-fstream_eof
deleted file mode 100644
index 80a7b77ff..000000000
--- a/package/uclibc++/patches/patch-fstream_eof
+++ /dev/null
@@ -1,15 +0,0 @@
-$Id$
- * fix crash on reading from closed fstream
-
---- uClibc++-0.2.2.orig/include/fstream 2007-06-04 00:51:12.000000000 +0200
-+++ uClibc++-0.2.2/include/fstream 2009-11-20 22:52:48.000000000 +0100
-@@ -206,6 +206,9 @@ namespace std{
- return traits::eof();
- }
-
-+ if(fp == 0)
-+ return traits::eof();
-+
- if(basic_streambuf<charT,traits>::eback() == 0){
- //No buffer, so...
- charT c;
diff --git a/package/uclibc++/patches/patch-include_associative_base b/package/uclibc++/patches/patch-include_associative_base
deleted file mode 100644
index 5d80516ec..000000000
--- a/package/uclibc++/patches/patch-include_associative_base
+++ /dev/null
@@ -1,38 +0,0 @@
---- uClibc++-0.2.2.orig/include/associative_base 2007-06-04 00:51:12.000000000 +0200
-+++ uClibc++-0.2.2/include/associative_base 2009-11-20 23:08:04.000000000 +0100
-@@ -318,7 +318,7 @@ protected:
- typedef std::list<ValueType> listtype;
-
- typename listtype::iterator base_iter;
-- typedef _associative_citer<ValueType, Compare, Allocator> _associative_citer;
-+ typedef _associative_citer<ValueType, Compare, Allocator> __associative_citer;
-
-
- public:
-@@ -347,13 +347,13 @@ public:
- bool operator==(const _associative_iter & m) const{
- return m.base_iter == base_iter;
- }
-- bool operator==(const _associative_citer & m) const{
-+ bool operator==(const __associative_citer & m) const{
- return m.base_iter == base_iter;
- }
- bool operator!=(const _associative_iter & m) const{
- return m.base_iter != base_iter;
- }
-- bool operator!=(const _associative_citer & m) const{
-+ bool operator!=(const __associative_citer & m) const{
- return m.base_iter != base_iter;
- }
- _associative_iter & operator++(){
-@@ -378,8 +378,8 @@ public:
- --base_iter;
- return temp;
- }
-- operator _associative_citer() const{
-- return _associative_citer(base_iter);
-+ operator __associative_citer() const{
-+ return __associative_citer(base_iter);
- }
- typename listtype::iterator base_iterator(){
- return base_iter;
diff --git a/package/uclibc++/patches/patch-include_string b/package/uclibc++/patches/patch-include_string
deleted file mode 100644
index ee64a44a5..000000000
--- a/package/uclibc++/patches/patch-include_string
+++ /dev/null
@@ -1,17 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- uClibc++-0.2.2.orig/include/string 2007-06-04 00:51:12.000000000 +0200
-+++ uClibc++-0.2.2/include/string 2009-11-20 22:52:48.000000000 +0100
-@@ -1017,11 +1017,11 @@ template<class charT, class traits, clas
-
- template <> _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
- template <> _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
--template <> _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
-+template <> _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
-
- template <> _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
- template <> _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
--template <> _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
-+template <> _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
-
- template <> _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
- template <> _UCXXEXPORT string operator+(const char* lhs, const string & rhs);
diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h
deleted file mode 100644
index 6e2362adc..000000000
--- a/package/uclibc++/patches/patch-include_unwind-cxx_h
+++ /dev/null
@@ -1,358 +0,0 @@
-diff -Nur uClibc++-0.2.2.orig/include/unwind-cxx.h uClibc++-0.2.2/include/unwind-cxx.h
---- uClibc++-0.2.2.orig/include/unwind-cxx.h 2007-06-04 00:51:12.000000000 +0200
-+++ uClibc++-0.2.2/include/unwind-cxx.h 2010-07-31 09:31:32.416120094 +0200
-@@ -1,175 +1,179 @@
--// -*- C++ -*- Exception handling and frame unwind runtime interface routines.
--// Copyright (C) 2001 Free Software Foundation, Inc.
--//
--// This file is part of GCC.
--//
--// GCC is free software; you can redistribute it and/or modify
--// it under the terms of the GNU General Public License as published by
--// the Free Software Foundation; either version 2, or (at your option)
--// any later version.
--//
--// GCC is distributed in the hope that it will be useful,
--// but WITHOUT ANY WARRANTY; without even the implied warranty of
--// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--// GNU General Public License for more details.
--//
--// You should have received a copy of the GNU General Public License
--// along with GCC; see the file COPYING. If not, write to
--// the Free Software Foundation, 59 Temple Place - Suite 330,
--// Boston, MA 02111-1307, USA.
--
--// As a special exception, you may use this file as part of a free software
--// library without restriction. Specifically, if other files instantiate
--// templates or use macros or inline functions from this file, or you compile
--// this file and link it with other files to produce an executable, this
--// file does not by itself cause the resulting executable to be covered by
--// the GNU General Public License. This exception does not however
--// invalidate any other reasons why the executable file might be covered by
--// the GNU General Public License.
--
--// This is derived from the C++ ABI for IA-64. Where we diverge
--// for cross-architecture compatibility are noted with "@@@".
--
--#ifndef _UNWIND_CXX_H
--#define _UNWIND_CXX_H 1
--
--// Level 2: C++ ABI
--
--#include <typeinfo>
--#include <exception>
--#include <cstddef>
--#include "unwind.h"
--
--#pragma GCC visibility push(default)
--
--namespace __cxxabiv1
--{
--
--// A C++ exception object consists of a header, which is a wrapper around
--// an unwind object header with additional C++ specific information,
--// followed by the exception object itself.
--
--struct __cxa_exception
--{
-- // Manage the exception object itself.
-- std::type_info *exceptionType;
-- void (*exceptionDestructor)(void *);
--
-- // The C++ standard has entertaining rules wrt calling set_terminate
-- // and set_unexpected in the middle of the exception cleanup process.
-- std::unexpected_handler unexpectedHandler;
-- std::terminate_handler terminateHandler;
--
-- // The caught exception stack threads through here.
-- __cxa_exception *nextException;
--
-- // How many nested handlers have caught this exception. A negated
-- // value is a signal that this object has been rethrown.
-- int handlerCount;
--
-- // Cache parsed handler data from the personality routine Phase 1
-- // for Phase 2 and __cxa_call_unexpected.
-- int handlerSwitchValue;
-- const unsigned char *actionRecord;
-- const unsigned char *languageSpecificData;
-- _Unwind_Ptr catchTemp;
-- void *adjustedPtr;
--
-- // The generic exception header. Must be last.
-- _Unwind_Exception unwindHeader;
--};
--
--// Each thread in a C++ program has access to a __cxa_eh_globals object.
--struct __cxa_eh_globals
--{
-- __cxa_exception *caughtExceptions;
-- unsigned int uncaughtExceptions;
--};
--
--
--// The __cxa_eh_globals for the current thread can be obtained by using
--// either of the following functions. The "fast" version assumes at least
--// one prior call of __cxa_get_globals has been made from the current
--// thread, so no initialization is necessary.
--extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
--extern "C" __cxa_eh_globals *__cxa_get_globals_fast () throw();
--
--// Allocate memory for the exception plus the thown object.
--extern "C" void *__cxa_allocate_exception(std::size_t thrown_size) throw();
--
--// Free the space allocated for the exception.
--extern "C" void __cxa_free_exception(void *thrown_exception) throw();
--
--// Throw the exception.
--extern "C" void __cxa_throw (void *thrown_exception,
-- std::type_info *tinfo,
-- void (*dest) (void *))
-- __attribute__((noreturn));
--
--// Used to implement exception handlers.
--extern "C" void *__cxa_begin_catch (void *) throw();
--extern "C" void __cxa_end_catch ();
--extern "C" void __cxa_rethrow () __attribute__((noreturn));
--
--// These facilitate code generation for recurring situations.
--extern "C" void __cxa_bad_cast ();
--extern "C" void __cxa_bad_typeid ();
--
--// @@@ These are not directly specified by the IA-64 C++ ABI.
--
--// Handles re-checking the exception specification if unexpectedHandler
--// throws, and if bad_exception needs to be thrown. Called from the
--// compiler.
--extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn));
--
--// Invokes given handler, dying appropriately if the user handler was
--// so inconsiderate as to return.
--extern void __terminate(std::terminate_handler) __attribute__((noreturn));
--extern void __unexpected(std::unexpected_handler) __attribute__((noreturn));
--
--// The current installed user handlers.
--extern std::terminate_handler __terminate_handler;
--extern std::unexpected_handler __unexpected_handler;
--
--// These are explicitly GNU C++ specific.
--
--// This is the exception class we report -- "GNUCC++\0".
--const _Unwind_Exception_Class __gxx_exception_class
--= ((((((((_Unwind_Exception_Class) 'G'
-- << 8 | (_Unwind_Exception_Class) 'N')
-- << 8 | (_Unwind_Exception_Class) 'U')
-- << 8 | (_Unwind_Exception_Class) 'C')
-- << 8 | (_Unwind_Exception_Class) 'C')
-- << 8 | (_Unwind_Exception_Class) '+')
-- << 8 | (_Unwind_Exception_Class) '+')
-- << 8 | (_Unwind_Exception_Class) '\0');
--
--// GNU C++ personality routine, Version 0.
--extern "C" _Unwind_Reason_Code __gxx_personality_v0
-- (int, _Unwind_Action, _Unwind_Exception_Class,
-- struct _Unwind_Exception *, struct _Unwind_Context *);
--
--// GNU C++ sjlj personality routine, Version 0.
--extern "C" _Unwind_Reason_Code __gxx_personality_sj0
-- (int, _Unwind_Action, _Unwind_Exception_Class,
-- struct _Unwind_Exception *, struct _Unwind_Context *);
--
--// Acquire the C++ exception header from the C++ object.
--static inline __cxa_exception *
--__get_exception_header_from_obj (void *ptr)
--{
-- return reinterpret_cast<__cxa_exception *>(ptr) - 1;
--}
--
--// Acquire the C++ exception header from the generic exception header.
--static inline __cxa_exception *
--__get_exception_header_from_ue (_Unwind_Exception *exc)
--{
-- return reinterpret_cast<__cxa_exception *>(exc + 1) - 1;
--}
--
--} /* namespace __cxxabiv1 */
--
--#pragma GCC visibility pop
--
--#endif // _UNWIND_CXX_H
-+// -*- C++ -*- Exception handling and frame unwind runtime interface routines.
-+// Copyright (C) 2001 Free Software Foundation, Inc.
-+//
-+// This file is part of GCC.
-+//
-+// GCC is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+//
-+// GCC is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with GCC; see the file COPYING. If not, write to
-+// the Free Software Foundation, 59 Temple Place - Suite 330,
-+// Boston, MA 02111-1307, USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction. Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License. This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+// This is derived from the C++ ABI for IA-64. Where we diverge
-+// for cross-architecture compatibility are noted with "@@@".
-+
-+#ifndef _UNWIND_CXX_H
-+#define _UNWIND_CXX_H 1
-+
-+// Level 2: C++ ABI
-+
-+#include <typeinfo>
-+#include <exception>
-+#include <cstddef>
-+#include "unwind.h"
-+
-+#pragma GCC visibility push(default)
-+
-+namespace __cxxabiv1
-+{
-+
-+// A C++ exception object consists of a header, which is a wrapper around
-+// an unwind object header with additional C++ specific information,
-+// followed by the exception object itself.
-+
-+struct __cxa_exception
-+{
-+ // Manage the exception object itself.
-+ std::type_info *exceptionType;
-+ void (*exceptionDestructor)(void *);
-+
-+ // The C++ standard has entertaining rules wrt calling set_terminate
-+ // and set_unexpected in the middle of the exception cleanup process.
-+ std::unexpected_handler unexpectedHandler;
-+ std::terminate_handler terminateHandler;
-+
-+ // The caught exception stack threads through here.
-+ __cxa_exception *nextException;
-+
-+ // How many nested handlers have caught this exception. A negated
-+ // value is a signal that this object has been rethrown.
-+ int handlerCount;
-+
-+ // Cache parsed handler data from the personality routine Phase 1
-+ // for Phase 2 and __cxa_call_unexpected.
-+ int handlerSwitchValue;
-+ const unsigned char *actionRecord;
-+ const unsigned char *languageSpecificData;
-+ _Unwind_Ptr catchTemp;
-+ void *adjustedPtr;
-+
-+ // The generic exception header. Must be last.
-+ _Unwind_Exception unwindHeader;
-+};
-+
-+// Each thread in a C++ program has access to a __cxa_eh_globals object.
-+struct __cxa_eh_globals
-+{
-+ __cxa_exception *caughtExceptions;
-+ unsigned int uncaughtExceptions;
-+};
-+
-+
-+// The __cxa_eh_globals for the current thread can be obtained by using
-+// either of the following functions. The "fast" version assumes at least
-+// one prior call of __cxa_get_globals has been made from the current
-+// thread, so no initialization is necessary.
-+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-+extern "C" __cxa_eh_globals *__cxa_get_globals_fast () throw();
-+
-+// Allocate memory for the exception plus the thown object.
-+extern "C" void *__cxa_allocate_exception(std::size_t thrown_size) throw();
-+
-+// Free the space allocated for the exception.
-+extern "C" void __cxa_free_exception(void *thrown_exception) throw();
-+
-+// Throw the exception.
-+extern "C" void __cxa_throw (void *thrown_exception,
-+ std::type_info *tinfo,
-+ void (*dest) (void *))
-+ __attribute__((noreturn));
-+
-+// Used to implement exception handlers.
-+extern "C" void *__cxa_begin_catch (void *) throw();
-+extern "C" void __cxa_end_catch ();
-+extern "C" void __cxa_rethrow () __attribute__((noreturn));
-+
-+// These facilitate code generation for recurring situations.
-+extern "C" void __cxa_bad_cast ();
-+extern "C" void __cxa_bad_typeid ();
-+
-+// @@@ These are not directly specified by the IA-64 C++ ABI.
-+
-+// Handles re-checking the exception specification if unexpectedHandler
-+// throws, and if bad_exception needs to be thrown. Called from the
-+// compiler.
-+extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn));
-+
-+// Invokes given handler, dying appropriately if the user handler was
-+// so inconsiderate as to return.
-+extern void __terminate(std::terminate_handler) __attribute__((noreturn));
-+extern void __unexpected(std::unexpected_handler) __attribute__((noreturn));
-+
-+// The current installed user handlers.
-+extern std::terminate_handler __terminate_handler;
-+extern std::unexpected_handler __unexpected_handler;
-+
-+// These are explicitly GNU C++ specific.
-+
-+// This is the exception class we report -- "GNUCC++\0".
-+const _Unwind_Exception_Class __gxx_exception_class
-+#ifndef __ARM_EABI_UNWINDER__
-+= ((((((((_Unwind_Exception_Class) 'G'
-+ << 8 | (_Unwind_Exception_Class) 'N')
-+ << 8 | (_Unwind_Exception_Class) 'U')
-+ << 8 | (_Unwind_Exception_Class) 'C')
-+ << 8 | (_Unwind_Exception_Class) 'C')
-+ << 8 | (_Unwind_Exception_Class) '+')
-+ << 8 | (_Unwind_Exception_Class) '+')
-+ << 8 | (_Unwind_Exception_Class) '\0');
-+#else
-+= "GNUC++";
-+#endif
-+
-+// GNU C++ personality routine, Version 0.
-+extern "C" _Unwind_Reason_Code __gxx_personality_v0
-+ (int, _Unwind_Action, _Unwind_Exception_Class,
-+ struct _Unwind_Exception *, struct _Unwind_Context *);
-+
-+// GNU C++ sjlj personality routine, Version 0.
-+extern "C" _Unwind_Reason_Code __gxx_personality_sj0
-+ (int, _Unwind_Action, _Unwind_Exception_Class,
-+ struct _Unwind_Exception *, struct _Unwind_Context *);
-+
-+// Acquire the C++ exception header from the C++ object.
-+static inline __cxa_exception *
-+__get_exception_header_from_obj (void *ptr)
-+{
-+ return reinterpret_cast<__cxa_exception *>(ptr) - 1;
-+}
-+
-+// Acquire the C++ exception header from the generic exception header.
-+static inline __cxa_exception *
-+__get_exception_header_from_ue (_Unwind_Exception *exc)
-+{
-+ return reinterpret_cast<__cxa_exception *>(exc + 1) - 1;
-+}
-+
-+} /* namespace __cxxabiv1 */
-+
-+#pragma GCC visibility pop
-+
-+#endif // _UNWIND_CXX_H
diff --git a/package/uclibc++/patches/patch-src_string_cpp b/package/uclibc++/patches/patch-src_string_cpp
deleted file mode 100644
index 8404c1e29..000000000
--- a/package/uclibc++/patches/patch-src_string_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- uClibc++-0.2.2.orig/src/string.cpp 2007-06-04 00:51:13.000000000 +0200
-+++ uClibc++-0.2.2/src/string.cpp 2009-11-20 22:52:48.000000000 +0100
-@@ -76,11 +76,11 @@ namespace std{
-
- template _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
- template _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
-- template _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
-+ template _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
-
- template _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
- template _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
-- template _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
-+ template _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
-
- template _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
- template _UCXXEXPORT string operator+(const char* lhs, const string & rhs);