patches/gcc/4.3.0/340-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 29 21:16:51 2009 +0100 (2009-12-29)
branch1.5
changeset 1707 b522b439a1e4
permissions -rw-r--r--
config: fix generated config files when GREP_OPTIONS set --color=always

grep is used when generating some .in files (in config.gen). If GREP_OPTIONS
contains --color=always, then the generated files will contains some escape
sequences setting the color, and mconf would choke on those escape sequences.

Always set and export an empty GREP_OPTIONS to avoid that.

Issue reported by Kevin Kirkup <kevin dot kirkup at gmail dot com> :
http://sourceware.org/ml/crossgcc/2009-12/msg00026.html
(transplanted from a5020a1facffc046d23d39a71a1b8089ca84beac)
yann@757
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/uclibc/90_all_304-index_macro.patch
yann@757
     2
diff -durN gcc-4.3.0.orig/libstdc++-v3/include/ext/rope gcc-4.3.0/libstdc++-v3/include/ext/rope
yann@757
     3
--- gcc-4.3.0.orig/libstdc++-v3/include/ext/rope	2008-01-31 19:44:55.000000000 +0100
yann@757
     4
+++ gcc-4.3.0/libstdc++-v3/include/ext/rope	2008-06-10 14:45:58.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.0.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.0/libstdc++-v3/include/ext/ropeimpl.h
yann@757
    16
--- gcc-4.3.0.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
yann@757
    17
+++ gcc-4.3.0/libstdc++-v3/include/ext/ropeimpl.h	2008-06-10 14:45:58.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;