patches/gcc/4.4.6/350-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 2149 98b7806295cc
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
     1 -= BEGIN original header =-
     2 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
     3 -= END original header =-
     4 
     5 diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/rope gcc-4.4.5/libstdc++-v3/include/ext/rope
     6 --- gcc-4.4.5.orig/libstdc++-v3/include/ext/rope	2009-04-10 01:23:07.000000000 +0200
     7 +++ gcc-4.4.5/libstdc++-v3/include/ext/rope	2010-10-09 23:12:51.000000000 +0200
     8 @@ -54,6 +54,9 @@
     9  #include <bits/gthr.h>
    10  #include <tr1/functional>
    11  
    12 +/* cope w/ index defined as macro, SuSv3 proposal */
    13 +#undef index
    14 +
    15  # ifdef __GC
    16  #   define __GC_CONST const
    17  # else
    18 diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h
    19 --- gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h	2009-04-10 01:23:07.000000000 +0200
    20 +++ gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h	2010-10-09 23:12:51.000000000 +0200
    21 @@ -49,6 +49,9 @@
    22  #include <ext/memory> // For uninitialized_copy_n
    23  #include <ext/numeric> // For power
    24  
    25 +/* cope w/ index defined as macro, SuSv3 proposal */
    26 +#undef index
    27 +
    28  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    29  
    30    using std::size_t;