patches/gcc/4.2.1/200-index_macro.patch
author |
"Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> |
|
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28) |
changeset 2573 |
424fa2092ace |
parent 313 |
2f223aafc7cb
|
permissions |
-rw-r--r-- |
scripts/libc: do not build add-ons by default
Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.
This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.
This patch disables the building of all add-ons in that case.
It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.
Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
yann@313
|
1 |
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope
|
yann@313
|
2 |
--- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200
|
yann@313
|
3 |
+++ gcc-4.2.1/libstdc++-v3/include/ext/rope 2007-08-03 20:34:23.000000000 +0200
|
yann@313
|
4 |
@@ -58,6 +58,9 @@
|
yann@313
|
5 |
#include <bits/allocator.h>
|
yann@313
|
6 |
#include <ext/hash_fun.h>
|
yann@313
|
7 |
|
yann@313
|
8 |
+/* cope w/ index defined as macro, SuSv3 proposal */
|
yann@313
|
9 |
+#undef index
|
yann@313
|
10 |
+
|
yann@313
|
11 |
# ifdef __GC
|
yann@313
|
12 |
# define __GC_CONST const
|
yann@313
|
13 |
# else
|
yann@313
|
14 |
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h
|
yann@313
|
15 |
--- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200
|
yann@313
|
16 |
+++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h 2007-08-03 20:34:23.000000000 +0200
|
yann@313
|
17 |
@@ -54,6 +54,9 @@
|
yann@313
|
18 |
#include <ext/memory> // For uninitialized_copy_n
|
yann@313
|
19 |
#include <ext/numeric> // For power
|
yann@313
|
20 |
|
yann@313
|
21 |
+/* cope w/ index defined as macro, SuSv3 proposal */
|
yann@313
|
22 |
+#undef index
|
yann@313
|
23 |
+
|
yann@313
|
24 |
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
yann@313
|
25 |
|
yann@313
|
26 |
using std::size_t;
|