patches/gcc/4.3.2/290-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 757 90e887b06da3
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
     2 diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/rope gcc-4.3.1/libstdc++-v3/include/ext/rope
     3 --- gcc-4.3.1.orig/libstdc++-v3/include/ext/rope	2008-01-31 19:44:55.000000000 +0100
     4 +++ gcc-4.3.1/libstdc++-v3/include/ext/rope	2008-06-10 14:59:02.000000000 +0200
     5 @@ -59,6 +59,9 @@
     6  #include <bits/gthr.h>
     7  #include <tr1/functional>
     8  
     9 +/* cope w/ index defined as macro, SuSv3 proposal */
    10 +#undef index
    11 +
    12  # ifdef __GC
    13  #   define __GC_CONST const
    14  # else
    15 diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h
    16 --- gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
    17 +++ gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h	2008-06-10 14:59:02.000000000 +0200
    18 @@ -54,6 +54,9 @@
    19  #include <ext/memory> // For uninitialized_copy_n
    20  #include <ext/numeric> // For power
    21  
    22 +/* cope w/ index defined as macro, SuSv3 proposal */
    23 +#undef index
    24 +
    25  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    26  
    27    using std::size_t;