Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/3.4.6/130-index_macro.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:30:37 2010 +0200 (2010-07-29)
branch1.7
changeset 2047 ace1d90c9b15
parent 339 bd5e0a849352
permissions -rw-r--r--
scripts: remove . from $PATH

Add CT_SanitizePath function which removes entries referring to ., /tmp
and non-existing directories from $PATH, and call it early in the
build script.

If . is in PATH, gcc-4.4.4 build breaks:

[ALL ] checking what assembler to use...
/tmp/build/targets/arm-unknown-linux-uclibcgnueabi/build/gcc-core-static/arm-unknown-linux-uclibcgnueabi/bin/as
...
[ALL ] config.status: creating as

i.e. "as" is supposed to be the arm-unknown-linux-uclibcgnueabi cross assembler,
but config.status creates a local "as" script which is calling the
host assembler.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[Yann E. MORIN: style fixes + explanations]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 20dd8cef1c8adff0aa3e78ae6d7acfbc45ed5a83)
yann@339 
     1
 
diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/rope gcc-3.4.6/libstdc++-v3/include/ext/rope
yann@339 
     2
 
--- gcc-3.4.6.orig/libstdc++-v3/include/ext/rope	2005-01-16 23:08:43.000000000 +0100
yann@339 
     3
 
+++ gcc-3.4.6/libstdc++-v3/include/ext/rope	2007-08-15 22:53:37.000000000 +0200
yann@339 
     4
 
@@ -58,6 +58,9 @@
yann@339 
     5
 
 #include <bits/allocator.h>
yann@339 
     6
 
 #include <ext/hash_fun.h>
yann@339 
     7
yann@339 
     8
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@339 
     9
 
+#undef index
yann@339 
    10
 
+
yann@339 
    11
 
 # ifdef __GC
yann@339 
    12
 
 #   define __GC_CONST const
yann@339 
    13
 
 # else
yann@339 
    14
 
diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h
yann@339 
    15
 
--- gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h	2004-09-08 15:36:04.000000000 +0200
yann@339 
    16
 
+++ gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h	2007-08-15 22:53:37.000000000 +0200
yann@339 
    17
 
@@ -53,6 +53,9 @@
yann@339 
    18
 
 #include <ext/memory> // For uninitialized_copy_n
yann@339 
    19
 
 #include <ext/numeric> // For power
yann@339 
    20
yann@339 
    21
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@339 
    22
 
+#undef index
yann@339 
    23
 
+
yann@339 
    24
 
 namespace __gnu_cxx
yann@339 
    25
 
 {
yann@339 
    26
 
   using std::size_t;
crosstool-ng