patches/glibc/2.12.1/910-typedef-caddr.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11)
changeset 3293 e11a8a2e225d
permissions -rw-r--r--
comptools: do not force build of make-3.81 unless really needed

On systems with make-3.82, we forcibly force the build and the use
of make-3.81

But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.

Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.

Note that no component selects this option for now. It will come in
later patches as we find them.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
     2 --- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
     3 +++ glibc-2.12.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.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
    16 --- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
    17 +++ glibc-2.12.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