summaryrefslogtreecommitdiff
path: root/package/uclibc++
diff options
context:
space:
mode:
Diffstat (limited to 'package/uclibc++')
-rw-r--r--package/uclibc++/Makefile4
-rw-r--r--package/uclibc++/files/config6
-rw-r--r--package/uclibc++/patches/patch-fstream_eof10
-rw-r--r--package/uclibc++/patches/patch-include_associative_base38
-rw-r--r--package/uclibc++/patches/patch-include_locale19
-rw-r--r--package/uclibc++/patches/patch-include_string6
-rw-r--r--package/uclibc++/patches/patch-src_string_cpp6
7 files changed, 56 insertions, 33 deletions
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index d2691a9a4..0041fc146 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= uClibc++
-PKG_VERSION:= 0.2.1
+PKG_VERSION:= 0.2.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6e6032c49916b199ffe6a585552fd46b
+PKG_MD5SUM:= 1ceef3209cca88be8f1bd9de99735954
PKG_DESCR:= A standard c++ library for embedded systems
PKG_SECTION:= libs
PKG_URL:= http://cxx.uclibc.org
diff --git a/package/uclibc++/files/config b/package/uclibc++/files/config
index 2831ccc8e..90427ca54 100644
--- a/package/uclibc++/files/config
+++ b/package/uclibc++/files/config
@@ -15,7 +15,7 @@ HAVE_DOT_CONFIG=y
#
# String and I/O Stream Support
#
-# UCLIBCXX_HAS_WCHAR is not set
+UCLIBCXX_HAS_WCHAR=y
UCLIBCXX_IOSTREAM_BUFSIZE=32
UCLIBCXX_HAS_LFS=y
UCLIBCXX_SUPPORT_CDIR=y
@@ -23,6 +23,10 @@ UCLIBCXX_SUPPORT_CIN=y
UCLIBCXX_SUPPORT_COUT=y
UCLIBCXX_SUPPORT_CERR=y
# UCLIBCXX_SUPPORT_CLOG is not set
+UCLIBCXX_SUPPORT_WCIN=y
+UCLIBCXX_SUPPORT_WCOUT=y
+UCLIBCXX_SUPPORT_WCERR=y
+UCLIBCXX_SUPPORT_WCLOG=y
#
# STL and Code Expansion
diff --git a/package/uclibc++/patches/patch-fstream_eof b/package/uclibc++/patches/patch-fstream_eof
index d60bee8b1..80a7b77ff 100644
--- a/package/uclibc++/patches/patch-fstream_eof
+++ b/package/uclibc++/patches/patch-fstream_eof
@@ -1,11 +1,11 @@
$Id$
* fix crash on reading from closed fstream
---- uClibc++-0.2.1.orig/include/fstream 2006-09-04 04:28:09.000000000 +0200
-+++ uClibc++-0.2.1/include/fstream 2008-12-14 18:20:27.000000000 +0100
-@@ -201,6 +201,9 @@ namespace std{
-
- */
+--- 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();
diff --git a/package/uclibc++/patches/patch-include_associative_base b/package/uclibc++/patches/patch-include_associative_base
new file mode 100644
index 000000000..5d80516ec
--- /dev/null
+++ b/package/uclibc++/patches/patch-include_associative_base
@@ -0,0 +1,38 @@
+--- 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_locale b/package/uclibc++/patches/patch-include_locale
deleted file mode 100644
index 2ecee1c11..000000000
--- a/package/uclibc++/patches/patch-include_locale
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- uClibc++-0.2.1.orig/include/locale 2006-09-04 04:28:07.000000000 +0200
-+++ uClibc++-0.2.1/include/locale 2009-04-29 19:48:20.096785868 +0200
-@@ -19,6 +19,7 @@
-
- #include <basic_definitions>
- #include <cstddef>
-+#include <string>
-
- #ifndef __HEADER_STD_LOCALE
- #define __HEADER_STD_LOCALE 1
-@@ -56,6 +57,7 @@ namespace std{
- const locale& operator=(const locale&) throw(){
- return *this;
- }
-+ std::string name() const { return "C"; }
- };
-
- class _UCXXEXPORT locale::facet {
diff --git a/package/uclibc++/patches/patch-include_string b/package/uclibc++/patches/patch-include_string
index 46f900bb5..ee64a44a5 100644
--- a/package/uclibc++/patches/patch-include_string
+++ b/package/uclibc++/patches/patch-include_string
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- uClibc++-0.2.1.orig/include/string 2006-09-04 04:28:07.000000000 +0200
-+++ uClibc++-0.2.1/include/string 2008-12-14 18:22:26.000000000 +0100
-@@ -1010,11 +1010,11 @@ template<class charT, class traits, clas
+--- 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);
diff --git a/package/uclibc++/patches/patch-src_string_cpp b/package/uclibc++/patches/patch-src_string_cpp
index e1b56a985..8404c1e29 100644
--- a/package/uclibc++/patches/patch-src_string_cpp
+++ b/package/uclibc++/patches/patch-src_string_cpp
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- uClibc++-0.2.1.orig/src/string.cpp 2006-09-04 04:28:07.000000000 +0200
-+++ uClibc++-0.2.1/src/string.cpp 2008-12-14 18:23:21.000000000 +0100
-@@ -74,11 +74,11 @@ namespace std{
+--- 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);