patches/gcc/4.3.3/290-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)
     1 Original patch from: ../4.3.2/290-index_macro.patch
     2 
     3 -= BEGIN original header =-
     4 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
     5 -= END original header =-
     6 
     7 diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
     8 --- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200
     9 +++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100
    10 @@ -59,6 +59,9 @@
    11  #include <bits/gthr.h>
    12  #include <tr1/functional>
    13  
    14 +/* cope w/ index defined as macro, SuSv3 proposal */
    15 +#undef index
    16 +
    17  # ifdef __GC
    18  #   define __GC_CONST const
    19  # else
    20 diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
    21 --- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
    22 +++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100
    23 @@ -54,6 +54,9 @@
    24  #include <ext/memory> // For uninitialized_copy_n
    25  #include <ext/numeric> // For power
    26  
    27 +/* cope w/ index defined as macro, SuSv3 proposal */
    28 +#undef index
    29 +
    30  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    31  
    32    using std::size_t;