patches/gcc/4.4.0/350-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Sep 12 23:51:25 2010 +0200 (2010-09-12)
changeset 2123 ff2181adbd28
parent 1461 35b30f8fb307
permissions -rw-r--r--
cc/gcc: disable complibs if not selected

Force gcc to not link with some companion libraries when
there are not needed (because selected-out).

There is no option to tell gcc *not* to build the Graphite and/or
LTO stuff. They *will* be built if gcc finds the suitable companion
libraries. If we do not provide them, but the host has them, then
gcc *will* find them, and link with them.

Consider the following:
- host has suitable PPL and CLooG (eg. Debian Squeeze)
- user wants to build gcc>=4.4
- user de-selects GRAPHITE
- gcc will find the hosts PPL and CLooG, and will use them
- the user moves the toolchain to an older host that does
not have them (eg. Debian Lenny)
- the toolchain fails, when it was properly setup not to

So, explicitly tell gcc *not* to use unneeded companion libs.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
thomas@1461
     1
Original patch from: ../4.3.2/290-index_macro.patch
thomas@1461
     2
thomas@1461
     3
-= BEGIN original header =-
thomas@1461
     4
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
thomas@1461
     5
-= END original header =-
thomas@1461
     6
thomas@1461
     7
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
thomas@1461
     8
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200
thomas@1461
     9
+++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100
thomas@1461
    10
@@ -59,6 +59,9 @@
thomas@1461
    11
 #include <bits/gthr.h>
thomas@1461
    12
 #include <tr1/functional>
thomas@1461
    13
 
thomas@1461
    14
+/* cope w/ index defined as macro, SuSv3 proposal */
thomas@1461
    15
+#undef index
thomas@1461
    16
+
thomas@1461
    17
 # ifdef __GC
thomas@1461
    18
 #   define __GC_CONST const
thomas@1461
    19
 # else
thomas@1461
    20
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
thomas@1461
    21
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
thomas@1461
    22
+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100
thomas@1461
    23
@@ -54,6 +54,9 @@
thomas@1461
    24
 #include <ext/memory> // For uninitialized_copy_n
thomas@1461
    25
 #include <ext/numeric> // For power
thomas@1461
    26
 
thomas@1461
    27
+/* cope w/ index defined as macro, SuSv3 proposal */
thomas@1461
    28
+#undef index
thomas@1461
    29
+
thomas@1461
    30
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
thomas@1461
    31
 
thomas@1461
    32
   using std::size_t;