Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
changeset 2462 139b85d70b62
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
yann@2438 
     1
 
diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
yann@2438 
     2
 
--- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
yann@2438 
     3
 
+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
yann@2438 
     4
 
@@ -25,7 +25,7 @@
yann@2438 
     5
yann@2438 
     6
yann@2438 
     7
 
 ssize_t
yann@2438 
     8
 
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
yann@2438 
     9
 
+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
yann@2438 
    10
 
 {
yann@2438 
    11
 
   if (len > buflen)
yann@2438 
    12
 
     __chk_fail ();
yann@2438 
    13
 
diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
yann@2438 
    14
 
--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
yann@2438 
    15
 
+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
yann@2438 
    16
 
@@ -21,7 +21,7 @@
yann@2438 
    17
yann@2438 
    18
yann@2438 
    19
 
 ssize_t
yann@2438 
    20
 
-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
yann@2438 
    21
 
+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
yann@2438 
    22
 
 		  size_t buflen)
yann@2438 
    23
 
 {
yann@2438 
    24
 
   if (len > buflen)
crosstool-ng