fix nfsv4 with musl

5 files changed, 44 insertions, 2 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 2205336dd..90ccda2c6 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--enable-nfsv4 \
 			--disable-nfsv41 \
 			--with-krb5=${STAGING_TARGET_DIR}/usr \
 			--enable-gss
-CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
+#CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
 else
 CONFIGURE_ARGS+=	--disable-nfsv4 \
 			--disable-nfsv41 \
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am
index 45cc4bb47..5da9c311e 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am
@@ -1,5 +1,5 @@
 --- nfs-utils-1.3.0.orig/tools/rpcgen/Makefile.am	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/tools/rpcgen/Makefile.am	2014-05-13 21:22:49.000000000 +0200
++++ nfs-utils-1.3.0/tools/rpcgen/Makefile.am	2014-05-20 11:40:39.333034278 +0200
 @@ -1,7 +1,9 @@
  ## Process this file with automake to produce Makefile.in
  
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_am b/package/nfs-utils/patches/patch-utils_gssd_Makefile_am
new file mode 100644
index 000000000..999581560
--- /dev/null
+++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_am
@@ -0,0 +1,20 @@
+--- nfs-utils-1.3.0.orig/utils/gssd/Makefile.am	2014-03-25 16:12:07.000000000 +0100
++++ nfs-utils-1.3.0/utils/gssd/Makefile.am	2014-05-20 12:19:07.116371104 +0200
+@@ -40,7 +40,7 @@ gssd_LDADD =	../../support/nfs/libnfs.a
+ 		$(RPCSECGSS_LIBS) $(KRBLIBS) $(GSSAPI_LIBS)
+ gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
+ 
+-gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
++gssd_CFLAGS = $(AM_CFLAGS) \
+ 	      $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
+ 
+ svcgssd_SOURCES = \
+@@ -61,7 +61,7 @@ svcgssd_LDADD = \
+ 
+ svcgssd_LDFLAGS = $(KRBLDFLAGS)
+ 
+-svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
++svcgssd_CFLAGS = $(AM_CFLAGS) \
+ 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/package/nfs-utils/patches/patch-utils_gssd_gssd_h b/package/nfs-utils/patches/patch-utils_gssd_gssd_h
new file mode 100644
index 000000000..9dd1ba240
--- /dev/null
+++ b/package/nfs-utils/patches/patch-utils_gssd_gssd_h
@@ -0,0 +1,11 @@
+--- nfs-utils-1.3.0.orig/utils/gssd/gssd.h	2014-03-25 16:12:07.000000000 +0100
++++ nfs-utils-1.3.0/utils/gssd/gssd.h	2014-05-20 12:41:40.039573389 +0200
+@@ -32,7 +32,7 @@
+ #define _RPC_GSSD_H_
+ 
+ #include <sys/types.h>
+-#include <sys/queue.h>
++#include "queue.h"
+ #include <gssapi/gssapi.h>
+ 
+ #define MAX_FILE_NAMELEN	32
diff --git a/package/nfs-utils/patches/patch-utils_gssd_svcgssd_h b/package/nfs-utils/patches/patch-utils_gssd_svcgssd_h
new file mode 100644
index 000000000..5094fd8cc
--- /dev/null
+++ b/package/nfs-utils/patches/patch-utils_gssd_svcgssd_h
@@ -0,0 +1,11 @@
+--- nfs-utils-1.3.0.orig/utils/gssd/svcgssd.h	2014-03-25 16:12:07.000000000 +0100
++++ nfs-utils-1.3.0/utils/gssd/svcgssd.h	2014-05-20 12:44:06.504736498 +0200
+@@ -32,7 +32,7 @@
+ #define _RPC_SVCGSSD_H_
+ 
+ #include <sys/types.h>
+-#include <sys/queue.h>
++#include "queue.h"
+ #include <gssapi/gssapi.h>
+ 
+ void handle_nullreq(FILE *f);