patches/gcc/4.1.1/170-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
parent 1 eeea35fbf182
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@1
     1
--- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
yann@1
     2
+++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
yann@1
     3
@@ -59,6 +59,9 @@
yann@1
     4
 #include <bits/allocator.h>
yann@1
     5
 #include <ext/hash_fun.h>
yann@1
     6
 
yann@1
     7
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1
     8
+#undef index
yann@1
     9
+
yann@1
    10
 # ifdef __GC
yann@1
    11
 #   define __GC_CONST const
yann@1
    12
 # else
yann@1
    13
--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
yann@1
    14
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
yann@1
    15
@@ -53,6 +53,9 @@
yann@1
    16
 #include <ext/memory> // For uninitialized_copy_n
yann@1
    17
 #include <ext/numeric> // For power
yann@1
    18
 
yann@1
    19
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1
    20
+#undef index
yann@1
    21
+
yann@1
    22
 namespace __gnu_cxx
yann@1
    23
 {
yann@1
    24
   using std::size_t;