patches/gcc/4.2.4/220-libstdc++-namespace.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

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