patches/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
author |
"Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> |
|
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28) |
changeset 2573 |
424fa2092ace |
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@2437
|
1 |
diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
|
yann@2437
|
2 |
--- glibc-cvs-2.9.orig/debug/readlink_chk.c 2005-03-01 01:41:15.000000000 +0100
|
yann@2437
|
3 |
+++ glibc-cvs-2.9/debug/readlink_chk.c 2009-06-01 10:59:37.000000000 +0200
|
yann@2437
|
4 |
@@ -25,7 +25,7 @@
|
yann@2437
|
5 |
|
yann@2437
|
6 |
|
yann@2437
|
7 |
ssize_t
|
yann@2437
|
8 |
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
|
yann@2437
|
9 |
+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
|
yann@2437
|
10 |
{
|
yann@2437
|
11 |
if (len > buflen)
|
yann@2437
|
12 |
__chk_fail ();
|
yann@2437
|
13 |
diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
|
yann@2437
|
14 |
--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c 2006-04-24 18:56:12.000000000 +0200
|
yann@2437
|
15 |
+++ glibc-cvs-2.9/debug/readlinkat_chk.c 2009-06-01 11:07:26.000000000 +0200
|
yann@2437
|
16 |
@@ -21,7 +21,7 @@
|
yann@2437
|
17 |
|
yann@2437
|
18 |
|
yann@2437
|
19 |
ssize_t
|
yann@2437
|
20 |
-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
|
yann@2437
|
21 |
+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
|
yann@2437
|
22 |
size_t buflen)
|
yann@2437
|
23 |
{
|
yann@2437
|
24 |
if (len > buflen)
|