patches/gcc/4.2.0/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 111 2e16b9fc302d
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)
     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 +}