patches/gcc/4.2.0/220-libstdc++-namespace.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 111 2e16b9fc302d
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
     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 +}