Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.1/290-index_macro.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
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@757 
     1
 
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
yann@757 
     2
 
diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/rope gcc-4.3.1/libstdc++-v3/include/ext/rope
yann@757 
     3
 
--- gcc-4.3.1.orig/libstdc++-v3/include/ext/rope	2008-01-31 19:44:55.000000000 +0100
yann@757 
     4
 
+++ gcc-4.3.1/libstdc++-v3/include/ext/rope	2008-06-10 14:59:02.000000000 +0200
yann@757 
     5
 
@@ -59,6 +59,9 @@
yann@757 
     6
 
 #include <bits/gthr.h>
yann@757 
     7
 
 #include <tr1/functional>
yann@757 
     8
yann@757 
     9
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@757 
    10
 
+#undef index
yann@757 
    11
 
+
yann@757 
    12
 
 # ifdef __GC
yann@757 
    13
 
 #   define __GC_CONST const
yann@757 
    14
 
 # else
yann@757 
    15
 
diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h
yann@757 
    16
 
--- gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
yann@757 
    17
 
+++ gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h	2008-06-10 14:59:02.000000000 +0200
yann@757 
    18
 
@@ -54,6 +54,9 @@
yann@757 
    19
 
 #include <ext/memory> // For uninitialized_copy_n
yann@757 
    20
 
 #include <ext/numeric> // For power
yann@757 
    21
yann@757 
    22
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@757 
    23
 
+#undef index
yann@757 
    24
 
+
yann@757 
    25
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@757 
    26
yann@757 
    27
 
   using std::size_t;
crosstool-ng