mirror of
https://git.yoctoproject.org/poky
synced 2026-09-24 22:36:21 +02:00
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 (From OE-Core rev: 36e40db9e779b7c0319f1f14aa2cd979cf1de723) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,20 +1,22 @@
|
|||||||
Upstream-Status: Inappropriate [embedded specific]
|
Upstream-Status: Inappropriate [embedded specific]
|
||||||
|
|
||||||
--- ./support/nfs/svc_socket.c.orig 2004-12-12 06:43:52.000000000 +0000
|
Index: nfs-utils-1.2.3/support/nfs/svc_socket.c
|
||||||
+++ ./support/nfs/svc_socket.c 2004-12-12 06:50:04.000000000 +0000
|
===================================================================
|
||||||
@@ -66,6 +66,7 @@
|
--- nfs-utils-1.2.3.orig/support/nfs/svc_socket.c
|
||||||
memset ((char *) &addr, sizeof (addr));
|
+++ 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;
|
addr.sin_family = AF_INET;
|
||||||
|
|
||||||
+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
|
+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
|
||||||
ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
||||||
&rpcp);
|
&rpcp);
|
||||||
if (ret == 0 && rpcp != NULL)
|
if (ret == 0 && rpcp != NULL)
|
||||||
@@ -99,6 +100,7 @@
|
@@ -100,6 +101,7 @@ svc_socket (u_long number, int type, int
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
+#endif
|
+#endif
|
||||||
{
|
{
|
||||||
if (bindresvport (sock, &addr))
|
addr.sin_port = 0;
|
||||||
{
|
if (bind (sock, (struct sockaddr *) &addr, len) < 0)
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -17,6 +17,7 @@ PR = "r2"
|
|||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
|
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
|
||||||
file://nfs-utils-1.0.6-uclibc.patch \
|
file://nfs-utils-1.0.6-uclibc.patch \
|
||||||
|
file://nfs-utils-1.2.3-uclibc-libio.h.patch \
|
||||||
file://nfsserver"
|
file://nfsserver"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d"
|
SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d"
|
||||||
|
|||||||
Reference in New Issue
Block a user