From da34a889d218ba5722774a769842ed08a64279ae Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 2 Oct 2017 16:13:05 -0500 Subject: [PATCH] trinity: undefined UIO_MAXIOV need sys/io.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This upstream patch fixes the build error produced by building for powerpc 32bit after the glibc bump to 2.26 with the following internal toolchain config. gcc5.4.0 glibc2.26 bin2.28.1 linux4.1.43 Failure log: CC net/proto-ipv4.o net/proto-ipv4.c: In function ‘ip_setsockopt’: net/proto-ipv4.c:231:49: error: ‘UIO_MAXIOV’ undeclared (first use in this function); did you mean ‘_IO_MAGIC’? so->optlen = rnd() % sizeof(unsigned long)*(2*UIO_MAXIOV+512); ^~~~~~~~~~ _IO_MAGIC Signed-off-by: Matthew Weber [Arnout: add Matthew's Sob to the patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...clude-sys-io.h-for-UIO_MAXIOV-symbol.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/trinity/0006-Include-sys-io.h-for-UIO_MAXIOV-symbol.patch diff --git a/package/trinity/0006-Include-sys-io.h-for-UIO_MAXIOV-symbol.patch b/package/trinity/0006-Include-sys-io.h-for-UIO_MAXIOV-symbol.patch new file mode 100644 index 0000000000..27c7850a01 --- /dev/null +++ b/package/trinity/0006-Include-sys-io.h-for-UIO_MAXIOV-symbol.patch @@ -0,0 +1,40 @@ +From dd7fc8b44cc8bb8a7e9dc03aa3aa57fbefbf433b Mon Sep 17 00:00:00 2001 +From: Vinson Lee +Date: Tue, 20 Jun 2017 22:43:01 +0000 +Subject: [PATCH] Include sys/io.h for UIO_MAXIOV symbol. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch fixes this build error. + + CC net/proto-ipv4.o +net/proto-ipv4.c: In function ‘ip_setsockopt’: +net/proto-ipv4.c:231:49: error: ‘UIO_MAXIOV’ undeclared (first use in this function); did you mean ‘_IO_MAGIC’? + so->optlen = rnd() % sizeof(unsigned long)*(2*UIO_MAXIOV+512); + ^~~~~~~~~~ + _IO_MAGIC + +Upstream: https://github.com/kernelslacker/trinity/commit/dd7fc8b44cc8bb8a7e9dc03aa3aa57fbefbf433b + +Signed-off-by: Vinson Lee +Signed-off-by: Matthew Weber +--- + net/proto-ipv4.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/proto-ipv4.c b/net/proto-ipv4.c +index b77364e..9ffaa5e 100644 +--- a/net/proto-ipv4.c ++++ b/net/proto-ipv4.c +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +1.9.1 + -- 2.30.2