patches/gcc/4.2.4/220-libstdc++-namespace.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:30:37 2010 +0200 (2010-07-29)
branch1.7
changeset 2047 ace1d90c9b15
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
scripts: remove . from $PATH

Add CT_SanitizePath function which removes entries referring to ., /tmp
and non-existing directories from $PATH, and call it early in the
build script.

If . is in PATH, gcc-4.4.4 build breaks:

[ALL ] checking what assembler to use...
/tmp/build/targets/arm-unknown-linux-uclibcgnueabi/build/gcc-core-static/arm-unknown-linux-uclibcgnueabi/bin/as
...
[ALL ] config.status: creating as

i.e. "as" is supposed to be the arm-unknown-linux-uclibcgnueabi cross assembler,
but config.status creates a local "as" script which is calling the
host assembler.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[Yann E. MORIN: style fixes + explanations]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 20dd8cef1c8adff0aa3e78ae6d7acfbc45ed5a83)
     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 +}