Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.3/200-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 431 8bde4c6ea47a
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 diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope

     2 --- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope	2006-10-17 13:56:21.000000000 +0200

     3 +++ gcc-4.2.1/libstdc++-v3/include/ext/rope	2007-08-03 20:34:23.000000000 +0200

     4 @@ -58,6 +58,9 @@

     5  #include <bits/allocator.h>

     6  #include <ext/hash_fun.h>

     7  

     8 +/* cope w/ index defined as macro, SuSv3 proposal */

     9 +#undef index

    10 +

    11  # ifdef __GC

    12  #   define __GC_CONST const

    13  # else

    14 diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h

    15 --- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h	2006-10-17 13:56:21.000000000 +0200

    16 +++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h	2007-08-03 20:34:23.000000000 +0200

    17 @@ -54,6 +54,9 @@

    18  #include <ext/memory> // For uninitialized_copy_n

    19  #include <ext/numeric> // For power

    20  

    21 +/* cope w/ index defined as macro, SuSv3 proposal */

    22 +#undef index

    23 +

    24  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)

    25  

    26    using std::size_t;
crosstool-ng