patches/gcc/4.1.1/170-index_macro.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 1 eeea35fbf182
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
yann@1
     1
--- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
yann@1
     2
+++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
yann@1
     3
@@ -59,6 +59,9 @@
yann@1
     4
 #include <bits/allocator.h>
yann@1
     5
 #include <ext/hash_fun.h>
yann@1
     6
 
yann@1
     7
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1
     8
+#undef index
yann@1
     9
+
yann@1
    10
 # ifdef __GC
yann@1
    11
 #   define __GC_CONST const
yann@1
    12
 # else
yann@1
    13
--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
yann@1
    14
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
yann@1
    15
@@ -53,6 +53,9 @@
yann@1
    16
 #include <ext/memory> // For uninitialized_copy_n
yann@1
    17
 #include <ext/numeric> // For power
yann@1
    18
 
yann@1
    19
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1
    20
+#undef index
yann@1
    21
+
yann@1
    22
 namespace __gnu_cxx
yann@1
    23
 {
yann@1
    24
   using std::size_t;