mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
can-utils: fix musl build
Include additional headers like <sys/time.h> and <linux/sockios.h> to resolve undefined symbols. Fixes following autobuild failure: http://autobuild.buildroot.net/results/0dd/0ddb5a70358bdbb491fbee670c7843c15217e78d/ Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
df7c6adb5e
commit
f819586d47
28
package/can-utils/0001-log2asc-include-sys-time.h.patch
Normal file
28
package/can-utils/0001-log2asc-include-sys-time.h.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 50a71462a3291f7e08fa25f67b274792bb419211 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yegor Yefremov <yegorslists@googlemail.com>
|
||||||
|
Date: Tue, 14 Jul 2015 21:24:37 +0200
|
||||||
|
Subject: [PATCH 1/2] log2asc: include sys/time.h
|
||||||
|
|
||||||
|
Without this patch compilation against musl C library
|
||||||
|
breaks, because struct timeval cannot be found.
|
||||||
|
|
||||||
|
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
|
||||||
|
---
|
||||||
|
log2asc.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/log2asc.c b/log2asc.c
|
||||||
|
index 29d13e8..8fb88a9 100644
|
||||||
|
--- a/log2asc.c
|
||||||
|
+++ b/log2asc.c
|
||||||
|
@@ -48,6 +48,7 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <net/if.h>
|
||||||
|
+#include <sys/time.h>
|
||||||
|
#include <linux/can.h>
|
||||||
|
|
||||||
|
#include "lib.h"
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
@ -0,0 +1,42 @@
|
|||||||
|
From 204cfffefb2ee6058e5d22a4b65cff22e6cff5ee Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yegor Yefremov <yegorslists@googlemail.com>
|
||||||
|
Date: Thu, 16 Jul 2015 21:30:02 +0200
|
||||||
|
Subject: [PATCH 2/2] Include linux/sockios.h to fix musl build
|
||||||
|
|
||||||
|
Including <sys/ioctl.h> and <net/if.h> is not sufficient
|
||||||
|
to musl to find SIOCSIFNAME, so <linux/sockios.h> must be
|
||||||
|
included too.
|
||||||
|
|
||||||
|
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
|
||||||
|
---
|
||||||
|
slcan_attach.c | 1 +
|
||||||
|
slcand.c | 1 +
|
||||||
|
2 files changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/slcan_attach.c b/slcan_attach.c
|
||||||
|
index ab8ff0a..485cbe3 100644
|
||||||
|
--- a/slcan_attach.c
|
||||||
|
+++ b/slcan_attach.c
|
||||||
|
@@ -52,6 +52,7 @@
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <termios.h>
|
||||||
|
#include <linux/tty.h>
|
||||||
|
+#include <linux/sockios.h>
|
||||||
|
|
||||||
|
void print_usage(char *prg)
|
||||||
|
{
|
||||||
|
diff --git a/slcand.c b/slcand.c
|
||||||
|
index e5e4752..e8c70e0 100644
|
||||||
|
--- a/slcand.c
|
||||||
|
+++ b/slcand.c
|
||||||
|
@@ -38,6 +38,7 @@
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <termios.h>
|
||||||
|
#include <linux/tty.h>
|
||||||
|
+#include <linux/sockios.h>
|
||||||
|
|
||||||
|
/* Change this to whatever your daemon is called */
|
||||||
|
#define DAEMON_NAME "slcand"
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user