patches/gcc/4.0.4/160-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
parent 1 eeea35fbf182
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
     1 --- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
     2 +++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
     3 @@ -59,6 +59,9 @@
     4  #include <bits/allocator.h>
     5  #include <ext/hash_fun.h>
     6  
     7 +/* cope w/ index defined as macro, SuSv3 proposal */
     8 +#undef index
     9 +
    10  # ifdef __GC
    11  #   define __GC_CONST const
    12  # else
    13 --- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
    14 +++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
    15 @@ -53,6 +53,9 @@
    16  #include <ext/memory> // For uninitialized_copy_n
    17  #include <ext/numeric> // For power
    18  
    19 +/* cope w/ index defined as macro, SuSv3 proposal */
    20 +#undef index
    21 +
    22  namespace __gnu_cxx
    23  {
    24    using std::size_t;