summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-05-18 18:37:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-20 12:37:11 +0100
commit36e40db9e779b7c0319f1f14aa2cd979cf1de723 (patch)
treec42b4561d14f6679d30bb454f30f62ae9ee66a2f
parentd85c4cb45159bbc1da138def38acd0134b9d0c4c (diff)
downloadopenembedded-core-36e40db9e779b7c0319f1f14aa2cd979cf1de723.tar.gz
openembedded-core-36e40db9e779b7c0319f1f14aa2cd979cf1de723.tar.bz2
openembedded-core-36e40db9e779b7c0319f1f14aa2cd979cf1de723.tar.xz
openembedded-core-36e40db9e779b7c0319f1f14aa2cd979cf1de723.zip
nfs-utils_1.2.3.bb: Fix compile failure on uclibc
libio.h is not needed even in case of eglibc but still the patch is uclibc specific Refreshed nfs-utils-1.0.6-uclibc.patch against nfs-utils_1.2.3 no code change Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch16
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch26
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb1
3 files changed, 36 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
index e82480a07..6d46d3a59 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
@@ -1,20 +1,22 @@
Upstream-Status: Inappropriate [embedded specific]
---- ./support/nfs/svc_socket.c.orig 2004-12-12 06:43:52.000000000 +0000
-+++ ./support/nfs/svc_socket.c 2004-12-12 06:50:04.000000000 +0000
-@@ -66,6 +66,7 @@
- memset ((char *) &addr, sizeof (addr));
+Index: nfs-utils-1.2.3/support/nfs/svc_socket.c
+===================================================================
+--- nfs-utils-1.2.3.orig/support/nfs/svc_socket.c
++++ nfs-utils-1.2.3/support/nfs/svc_socket.c
+@@ -67,6 +67,7 @@ svc_socket (u_long number, int type, int
+ memset (&addr, 0, sizeof (addr));
addr.sin_family = AF_INET;
+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
&rpcp);
if (ret == 0 && rpcp != NULL)
-@@ -99,6 +100,7 @@
+@@ -100,6 +101,7 @@ svc_socket (u_long number, int type, int
}
}
else
+#endif
{
- if (bindresvport (sock, &addr))
- {
+ addr.sin_port = 0;
+ if (bind (sock, (struct sockaddr *) &addr, len) < 0)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch
new file mode 100644
index 000000000..465144a32
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch
@@ -0,0 +1,26 @@
+[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(-)
+
+Upstream-Status: Pending
+
+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
+
++/* uClibc doesn't have/need libio.h */
++#ifndef __UCLIBC__
+ #include <libio.h>
++#endif
+ #include <stdbool.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index b456474f9..d344f3dd8 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -17,6 +17,7 @@ PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
+ file://nfs-utils-1.2.3-uclibc-libio.h.patch \
file://nfsserver"
SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d"