]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
wireshark: fix build with musl
authorBaruch Siach <baruch@tkos.co.il>
Thu, 29 Dec 2016 19:16:56 +0000 (21:16 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 30 Dec 2016 21:17:45 +0000 (22:17 +0100)
Add a patch adding missing sys/time.h header.

Fixes:
http://autobuild.buildroot.net/results/cd8/cd883b40503a6f4d3035e09a383db2d5a21162ad/
http://autobuild.buildroot.net/results/1ae/1ae34debe7e95eab33a895ecdf04c0ddf96cf4ab/
http://autobuild.buildroot.net/results/4af/4afe968e698f62c6bdbec35e53d35c361c5e852b/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch [new file with mode: 0644]

diff --git a/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch b/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch
new file mode 100644 (file)
index 0000000..ae11980
--- /dev/null
@@ -0,0 +1,35 @@
+From 1ab938e762ee6ebd3211c22ef25a7575e37791c4 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 29 Dec 2016 20:16:53 +0200
+Subject: [PATCH] androiddump: add missing sys/time.h header
+
+struct timeval requires sys/time.h. Fixes the following musl libc build error:
+
+androiddump.c: In function 'useSndTimeout':
+androiddump.c:262:18: error: variable 'socket_timeout' has initializer but incomplete type
+     const struct timeval socket_timeout = {
+                  ^
+
+Change-Id: I52e204f32a012aabea2e54877e564576c072fe08
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://code.wireshark.org/review/19460
+---
+ extcap/androiddump.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extcap/androiddump.c b/extcap/androiddump.c
+index 8287c4bb1a76..fab7c10e05cc 100644
+--- a/extcap/androiddump.c
++++ b/extcap/androiddump.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <time.h>
++#include <sys/time.h>
+ #ifdef HAVE_NETINET_IN_H
+ #    include <netinet/in.h>
+-- 
+2.11.0
+