pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch

   1 @@ -, +, @@
   2 ---
   3  sunrpc/rpc/types.h | 22 ++++++----------------
   4  1 file changed, 6 insertions(+), 16 deletions(-)
   5 --- a/sunrpc/rpc/types.h
   6 +++ a/sunrpc/rpc/types.h
   7 @@ -69,24 +69,14 @@ typedef unsigned long rpcport_t;
   8  #include <sys/types.h>
   9  #endif
  10
  11 -#if defined __APPLE_CC__ || defined __FreeBSD__
  12 -# define __u_char_defined
  13 -# define __daddr_t_defined
  14 -#endif
  15 -
  16 -#ifndef __u_char_defined
  17 -typedef __u_char u_char;
  18 -typedef __u_short u_short;
  19 -typedef __u_int u_int;
  20 -typedef __u_long u_long;
  21 -typedef __quad_t quad_t;
  22 -typedef __u_quad_t u_quad_t;
  23 -typedef __fsid_t fsid_t;
  24 +/* IMPORTANT NOTE: This has been modified to build against the musl C
  25 + * library and it probably now ONLY builds with the musl C library.
  26 + *
  27 + * See: https://sourceware.org/bugzilla/show_bug.cgi?id=21604
  28 + */
  29  # define __u_char_defined
  30 -#endif
  31  #ifndef __daddr_t_defined
  32 -typedef __daddr_t daddr_t;
  33 -typedef __caddr_t caddr_t;
  34 +typedef int daddr_t;
  35  # define __daddr_t_defined
  36  #endif
  37
  38 --