patches/gcc/4.2.4/140-uclibc-locale-wchar_fix.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Jul 31 22:27:29 2012 +0200 (2012-07-31)
changeset 3018 7776e8369284
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
complibs/cloog: create missing m4 dir

Because we now patch configure.in and configure, the Makefile quicks
in a re-build rule as the source files are now more recent than the
bundled generated files, and that fails because the m4 directory
is missing, although on some systems where aclocal is not installed,
the re-build rule does nothing (except a warning).

Always create tht directory.

Reported-by: Per Arnold Blaasmo <per-arnold.blaasmo@atmel.com>
[Also thanks to Thomas De Schampheleire <patrickdepinguin@gmail.com>
for some digging works on this issue]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
     2 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:30:53.000000000 +0200
     3 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:31:24.000000000 +0200
     4 @@ -401,7 +401,7 @@
     5  # ifdef __UCLIBC_HAS_XLOCALE__
     6  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
     7  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
     8 -# else
     9 +# elif defined __UCLIBC_HAS_LOCALE__
    10  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    11  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    12  # endif
    13 @@ -556,7 +556,7 @@
    14  # ifdef __UCLIBC_HAS_XLOCALE__
    15  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    16  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    17 -# else
    18 +# elif defined __UCLIBC_HAS_LOCALE__
    19  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    20  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    21  # endif
    22 diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
    23 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:30:53.000000000 +0200
    24 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:31:24.000000000 +0200
    25 @@ -127,12 +127,25 @@
    26  	{
    27  	  // Named locale.
    28  	  // NB: In the GNU model wchar_t is always 32 bit wide.
    29 +#ifdef __UCLIBC_MJN3_ONLY__
    30 +#warning fix this... should be numeric
    31 +#endif
    32 +#ifdef __UCLIBC__
    33 +# ifdef __UCLIBC_HAS_XLOCALE__
    34 +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    35 +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    36 +# elif defined __UCLIBC_HAS_LOCALE__
    37 +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    38 +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    39 +# endif
    40 +#else
    41  	  union { char *__s; wchar_t __w; } __u;
    42  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
    43  	  _M_data->_M_decimal_point = __u.__w;
    44  
    45  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
    46  	  _M_data->_M_thousands_sep = __u.__w;
    47 +#endif
    48  
    49  	  if (_M_data->_M_thousands_sep == L'\0')
    50  	    _M_data->_M_grouping = "";