fix cross-compile on Darwin

6 files changed, 29 insertions, 19 deletions

diff --git a/package/libtirpc/patches/patch-src_des_crypt_c b/package/libtirpc/patches/patch-src_des_crypt_c
index c1c313dee..8a23f3c1a 100644
--- a/package/libtirpc/patches/patch-src_des_crypt_c
+++ b/package/libtirpc/patches/patch-src_des_crypt_c
@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/src/des_crypt.c	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/src/des_crypt.c	2014-03-22 13:20:53.000000000 +0100
+--- libtirpc-0.2.4.orig/src/des_crypt.c	2013-12-09 21:59:51.000000000 +0100
++++ libtirpc-0.2.4/src/des_crypt.c	2014-09-28 17:10:35.000000000 +0200
 @@ -39,11 +39,10 @@
  static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
  #endif
@@ -13,7 +13,7 @@
  /*
   * Copy 8 bytes
   */
-@@ -145,10 +144,6 @@ common_crypt(key, buf, len, mode, desp)
+@@ -145,10 +144,6 @@ common_crypt(key, buf, len, mode, desp)	
  		if (!__des_crypt_LOCAL(buf, len, desp)) {
  			return (DESERR_HWERROR);
  		}
diff --git a/package/libtirpc/patches/patch-src_rpc_soc_c b/package/libtirpc/patches/patch-src_rpc_soc_c
index 8d0c6ce2e..4055e95bb 100644
--- a/package/libtirpc/patches/patch-src_rpc_soc_c
+++ b/package/libtirpc/patches/patch-src_rpc_soc_c
@@ -1,6 +1,6 @@
---- libtirpc-0.2.3.orig/src/rpc_soc.c	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/src/rpc_soc.c	2013-08-12 16:47:07.000000000 +0200
-@@ -520,37 +520,6 @@ clnt_broadcast(prog, vers, proc, xargs,
+--- libtirpc-0.2.4.orig/src/rpc_soc.c	2013-12-09 21:59:51.000000000 +0100
++++ libtirpc-0.2.4/src/rpc_soc.c	2014-09-28 17:10:35.000000000 +0200
+@@ -520,37 +520,6 @@ clnt_broadcast(prog, vers, proc, xargs, 
  	    (resultproc_t) rpc_wrap_bcast, "udp");
  }
  
diff --git a/package/libtirpc/patches/patch-tirpc_netconfig_h b/package/libtirpc/patches/patch-tirpc_netconfig_h
index 2f17d5fd4..0aeb7ea0d 100644
--- a/package/libtirpc/patches/patch-tirpc_netconfig_h
+++ b/package/libtirpc/patches/patch-tirpc_netconfig_h
@@ -1,6 +1,16 @@
---- libtirpc-0.2.3.orig/tirpc/netconfig.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/netconfig.h	2014-03-22 13:20:52.000000000 +0100
-@@ -74,7 +74,9 @@ typedef struct {
+--- libtirpc-0.2.4.orig/tirpc/netconfig.h	2013-12-09 21:59:51.000000000 +0100
++++ libtirpc-0.2.4/tirpc/netconfig.h	2014-09-28 20:59:27.000000000 +0200
+@@ -1,7 +1,9 @@
+ #ifndef _NETCONFIG_H_
+ #define _NETCONFIG_H_
+ 
++#ifndef __APPLE__
+ #include <features.h>
++#endif
+ 
+ #define NETCONFIG "/etc/netconfig"
+ #define NETPATH	  "NETPATH"
+@@ -74,7 +76,9 @@ typedef struct {
  #define NC_UDP		"udp"
  #define NC_ICMP		"icmp"
  
@@ -11,7 +21,7 @@
  
  extern void *setnetconfig (void);
  extern struct netconfig *getnetconfig (void *);
-@@ -89,6 +91,8 @@ extern int endnetpath (void *);
+@@ -89,6 +93,8 @@ extern int endnetpath (void *);
  extern void nc_perror (const char *);
  extern char *nc_sperror (void);
  
diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_h
index 7e1f000a2..3ec297d82 100644
--- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_h
+++ b/package/libtirpc/patches/patch-tirpc_rpc_rpc_h
@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/tirpc/rpc/rpc.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/rpc/rpc.h	2014-03-22 13:20:52.000000000 +0100
+--- libtirpc-0.2.4.orig/tirpc/rpc/rpc.h	2013-12-09 21:59:51.000000000 +0100
++++ libtirpc-0.2.4/tirpc/rpc/rpc.h	2014-09-28 17:10:36.000000000 +0200
 @@ -79,9 +79,11 @@
  #define UDPMSGSIZE 8800
  #endif
@@ -14,7 +14,7 @@
  extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
      xdrproc_t, xdrproc_t);
  extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
-@@ -93,18 +95,24 @@ struct netbuf *uaddr2taddr(const struct
+@@ -93,18 +95,24 @@ struct netbuf *uaddr2taddr(const struct 
  
  struct sockaddr;
  extern int bindresvport_sa(int, struct sockaddr *);
diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h
index caee024d8..cd79e72a1 100644
--- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h
+++ b/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h
@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/tirpc/rpc/rpc_msg.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/rpc/rpc_msg.h	2014-03-22 13:20:52.000000000 +0100
+--- libtirpc-0.2.4.orig/tirpc/rpc/rpc_msg.h	2013-12-09 21:59:51.000000000 +0100
++++ libtirpc-0.2.4/tirpc/rpc/rpc_msg.h	2014-09-28 17:10:36.000000000 +0200
 @@ -161,7 +161,9 @@ struct rpc_msg {
  #define	acpted_rply	ru.RM_rmb.ru.RP_ar
  #define	rjcted_rply	ru.RM_rmb.ru.RP_dr
@@ -11,7 +11,7 @@
  /*
   * XDR routine to handle a rpc message.
   * xdr_callmsg(xdrs, cmsg)
-@@ -210,6 +212,8 @@ extern bool_t	xdr_rejected_reply(XDR *,
+@@ -210,6 +212,8 @@ extern bool_t	xdr_rejected_reply(XDR *, 
   * 	struct rpc_err *error;
   */
  extern void	_seterr_reply(struct rpc_msg *, struct rpc_err *);
diff --git a/package/libtirpc/patches/patch-tirpc_rpc_svc_h b/package/libtirpc/patches/patch-tirpc_rpc_svc_h
index fcaf5b172..7e0623573 100644
--- a/package/libtirpc/patches/patch-tirpc_rpc_svc_h
+++ b/package/libtirpc/patches/patch-tirpc_rpc_svc_h
@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/tirpc/rpc/svc.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/rpc/svc.h	2014-03-22 13:20:52.000000000 +0100
+--- libtirpc-0.2.4.orig/tirpc/rpc/svc.h	2013-12-09 21:59:51.000000000 +0100
++++ libtirpc-0.2.4/tirpc/rpc/svc.h	2014-09-28 17:10:36.000000000 +0200
 @@ -40,7 +40,6 @@
  
  #ifndef _TIRPC_SVC_H
@@ -139,7 +139,7 @@
  /*
   * Transport independent svc_create routine.
   */
-@@ -427,7 +456,9 @@ int svc_dg_enablecache(SVCXPRT *, const
+@@ -427,7 +456,9 @@ int svc_dg_enablecache(SVCXPRT *, const 
  
  int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid);