Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.6/290-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 2124 5dd0b83ae528
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     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;
crosstool-ng