summaryrefslogtreecommitdiffstats
path: root/package/nfs-utils/nfs-utils-uclibc-libio.h.patch
diff options
context:
space:
mode:
authorPeter Korsgaard2012-05-31 09:23:23 +0200
committerPeter Korsgaard2012-05-31 09:23:23 +0200
commitbdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch)
treed6012109e704c5e9abc709c23a7133a3d4b4f779 /package/nfs-utils/nfs-utils-uclibc-libio.h.patch
parentKickoff 2012.08 cycle (diff)
parentnfs-utils: bump to version 1.2.6 (diff)
downloadbuildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz
buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.xz
buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip
Merge branch 'next'
Conflicts: toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/nfs-utils/nfs-utils-uclibc-libio.h.patch')
-rw-r--r--package/nfs-utils/nfs-utils-uclibc-libio.h.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/package/nfs-utils/nfs-utils-uclibc-libio.h.patch b/package/nfs-utils/nfs-utils-uclibc-libio.h.patch
new file mode 100644
index 000000000..589b96f7a
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-uclibc-libio.h.patch
@@ -0,0 +1,25 @@
+[PATCH] fix build with uClibc
+
+uClibc doesn't have/need libio.h, so don't include it from sockaddr.h
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ support/include/sockaddr.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: nfs-utils-1.2.3/support/include/sockaddr.h
+===================================================================
+--- nfs-utils-1.2.3.orig/support/include/sockaddr.h
++++ nfs-utils-1.2.3/support/include/sockaddr.h
+@@ -20,7 +20,10 @@
+ #ifndef NFS_UTILS_SOCKADDR_H
+ #define NFS_UTILS_SOCKADDR_H
+
+-#include <libio.h>
++/* uClibc doesn't have/need libio.h */
++#ifndef __UCLIBC__
++#include <libio.h>
++#endif
+ #include <stdbool.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>