Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.0/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 111 2e16b9fc302d
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h

     2 --- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 13:06:56.000000000 +0100

     3 +++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 15:23:41.000000000 +0100

     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 -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h

    20 --- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 13:06:56.000000000 +0100

    21 +++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 15:20:31.000000000 +0100

    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