Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.3/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 29 21:16:51 2009 +0100 (2009-12-29)
changeset 1667 a5020a1facff
parent 431 8bde4c6ea47a
permissions -rw-r--r--
config: fix generated config files when GREP_OPTIONS set --color=always

grep is used when generating some .in files (in config.gen). If GREP_OPTIONS
contains --color=always, then the generated files will contains some escape
sequences setting the color, and mconf would choke on those escape sequences.

Always set and export an empty GREP_OPTIONS to avoid that.

Issue reported by Kevin Kirkup <kevin dot kirkup at gmail dot com> :
http://sourceware.org/ml/crossgcc/2009-12/msg00026.html 
     1 diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h

     2 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:31:54.000000000 +0200

     3 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:35:40.000000000 +0200

     4 @@ -32,7 +32,8 @@

     5  //

     6  

     7  // Written by Benjamin Kosnik <bkoz@redhat.com>

     8 -

     9 +namespace std

    10 +{

    11  #ifdef __UCLIBC_MJN3_ONLY__

    12  #warning fix prototypes for *textdomain funcs

    13  #endif

    14 @@ -115,3 +116,4 @@

    15  	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 

    16  	 }

    17       }

    18 +}

    19 diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h

    20 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:31:54.000000000 +0200

    21 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:35:40.000000000 +0200

    22 @@ -33,7 +33,8 @@

    23  //

    24  

    25  // Written by Benjamin Kosnik <bkoz@redhat.com>

    26 -

    27 +namespace std

    28 +{

    29    template<typename _CharT>

    30      __timepunct<_CharT>::__timepunct(size_t __refs) 

    31      : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 

    32 @@ -74,3 +75,4 @@

    33        delete _M_data; 

    34        _S_destroy_c_locale(_M_c_locale_timepunct); 

    35      }

    36 +}
crosstool-ng