patches/glibc/2.9/570-debug-readlink_chk-readklinkat_chk.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
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@1394
     1
diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
yann@1394
     2
--- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
yann@1394
     3
+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
yann@1394
     4
@@ -25,7 +25,7 @@
yann@1394
     5
 
yann@1394
     6
 
yann@1394
     7
 ssize_t
yann@1394
     8
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
yann@1394
     9
+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
yann@1394
    10
 {
yann@1394
    11
   if (len > buflen)
yann@1394
    12
     __chk_fail ();
yann@1394
    13
diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
yann@1394
    14
--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
yann@1394
    15
+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
yann@1394
    16
@@ -21,7 +21,7 @@
yann@1394
    17
 
yann@1394
    18
 
yann@1394
    19
 ssize_t
yann@1394
    20
-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
yann@1394
    21
+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
yann@1394
    22
 		  size_t buflen)
yann@1394
    23
 {
yann@1394
    24
   if (len > buflen)