patches/gcc/4.2.4/220-libstdc++-namespace.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
     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 +}