Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
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)
crosstool-ng