patches/glibc/2.9/910-typedef-caddr.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
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>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
eha@2379
     1
diff -urN glibc-2.9-orig/posix/sys/types.h glibc-2.9/posix/sys/types.h
eha@2379
     2
--- glibc-2.9-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
eha@2379
     3
+++ glibc-2.9/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
eha@2379
     4
@@ -114,7 +114,10 @@
eha@2379
     5
 #ifdef	__USE_BSD
eha@2379
     6
 # ifndef __daddr_t_defined
eha@2379
     7
 typedef __daddr_t daddr_t;
eha@2379
     8
+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
eha@2379
     9
 typedef __caddr_t caddr_t;
eha@2379
    10
+#   define __caddr_t_defined
eha@2379
    11
+#  endif
eha@2379
    12
 #  define __daddr_t_defined
eha@2379
    13
 # endif
eha@2379
    14
 #endif
eha@2379
    15
diff -urN glibc-2.9-orig/sunrpc/rpc/types.h glibc-2.9/sunrpc/rpc/types.h
eha@2379
    16
--- glibc-2.9-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
eha@2379
    17
+++ glibc-2.9/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
eha@2379
    18
@@ -80,7 +80,10 @@
eha@2379
    19
 #endif
eha@2379
    20
 #ifndef __daddr_t_defined
eha@2379
    21
 typedef __daddr_t daddr_t;
eha@2379
    22
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
eha@2379
    23
 typedef __caddr_t caddr_t;
eha@2379
    24
+#  define __caddr_t_defined
eha@2379
    25
+# endif
eha@2379
    26
 # define __daddr_t_defined
eha@2379
    27
 #endif
eha@2379
    28