patches/glibc/2.10.1/910-typedef-caddr.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:05:32 2011 +0200 (2011-05-19)
branch1.11
changeset 2463 7f87237857a0
permissions -rw-r--r--
complibs/ppl: update GMP location configuration argument for PPL v0.11 and later

'configure' for PPL 0.11 (and later) needs "--with-gmp-prefix" to
provide the location of the GMP toolkit; the previous switches were
"--with-libgmp-prefix" and "--with-libgmpxx-prefix".

The upstream log message is:

commit 08dfb6fea094f8c5a533575a3ea2095edce99a6d
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Sun Jul 12 21:39:46 2009 +0200

New configure option --with-gmp-prefix supersedes the (now removed)
options --with-libgmp-prefix and --with-libgmpxx-prefix.

Link: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=08dfb6fea094f8c5a533575a3ea2095edce99a6d

Since PPL's 'configure' ignores unknown switches, we use all three so we
don't have to conditionalize the ppl.sh build script itself.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 4f0c4fb572e2862c24b28e8d27ce7e9cb9adba65)
     1 diff -urN glibc-2.10.1-orig/posix/sys/types.h glibc-2.10.1/posix/sys/types.h
     2 --- glibc-2.10.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
     3 +++ glibc-2.10.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
     4 @@ -114,7 +114,10 @@
     5  #ifdef	__USE_BSD
     6  # ifndef __daddr_t_defined
     7  typedef __daddr_t daddr_t;
     8 +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
     9  typedef __caddr_t caddr_t;
    10 +#   define __caddr_t_defined
    11 +#  endif
    12  #  define __daddr_t_defined
    13  # endif
    14  #endif
    15 diff -urN glibc-2.10.1-orig/sunrpc/rpc/types.h glibc-2.10.1/sunrpc/rpc/types.h
    16 --- glibc-2.10.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
    17 +++ glibc-2.10.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
    18 @@ -80,7 +80,10 @@
    19  #endif
    20  #ifndef __daddr_t_defined
    21  typedef __daddr_t daddr_t;
    22 +# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
    23  typedef __caddr_t caddr_t;
    24 +#  define __caddr_t_defined
    25 +# endif
    26  # define __daddr_t_defined
    27  #endif
    28