patches/gcc/4.2.2/220-libstdc++-namespace.patch
author Matthieu Crapet <mcrapet@gmail.com>
Wed Jun 06 12:03:12 2012 +0200 (2012-06-06)
changeset 2991 252ade1e9e17
parent 431 8bde4c6ea47a
permissions -rw-r--r--
libc/eglibc: fix missing LIBC_TRY_CC_OPTION definition (eglibc 2.15)

Upstream SVN is currently broken:
http://www.eglibc.org/svn/branches/eglibc-2_15/libc/

LIBC_TRY_CC_OPTION macro is not defined in aclocal.m4.
This patch fix the configure script.

Once upstream branch will be fixed this patch could be reverted.

Related patch (committed to eglibc trunk):
Use autoconf macro for testing compiler options with empty input
http://sourceware.org/ml/libc-alpha/2012-03/msg00816.html

Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>

diff -r 1f6c8e4b2b92 -r d10afc5bcc25
patches/eglibc/2_15/110-aclocal-LIBC_TRY_CC_OPTION.patch
yann@313
     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
yann@313
     2
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:31:54.000000000 +0200
yann@313
     3
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:35:40.000000000 +0200
yann@313
     4
@@ -32,7 +32,8 @@
yann@313
     5
 //
yann@313
     6
 
yann@313
     7
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@313
     8
-
yann@313
     9
+namespace std
yann@313
    10
+{
yann@313
    11
 #ifdef __UCLIBC_MJN3_ONLY__
yann@313
    12
 #warning fix prototypes for *textdomain funcs
yann@313
    13
 #endif
yann@313
    14
@@ -115,3 +116,4 @@
yann@313
    15
 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
yann@313
    16
 	 }
yann@313
    17
      }
yann@313
    18
+}
yann@313
    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
yann@313
    20
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:31:54.000000000 +0200
yann@313
    21
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:35:40.000000000 +0200
yann@313
    22
@@ -33,7 +33,8 @@
yann@313
    23
 //
yann@313
    24
 
yann@313
    25
 // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@313
    26
-
yann@313
    27
+namespace std
yann@313
    28
+{
yann@313
    29
   template<typename _CharT>
yann@313
    30
     __timepunct<_CharT>::__timepunct(size_t __refs) 
yann@313
    31
     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
yann@313
    32
@@ -74,3 +75,4 @@
yann@313
    33
       delete _M_data; 
yann@313
    34
       _S_destroy_c_locale(_M_c_locale_timepunct); 
yann@313
    35
     }
yann@313
    36
+}