47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
|
From 73fa408f51ec25121075aaccac9c9db1c68567cd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Thu, 12 Mar 2020 10:02:18 +0100
|
||
|
|
Subject: [PATCH] linux.c: fix musl build
|
||
|
|
|
||
|
|
Remove include on linux/if_link.h to avoid the following build failure
|
||
|
|
with musl:
|
||
|
|
|
||
|
|
In file included from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4,
|
||
|
|
from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:4,
|
||
|
|
from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/if_link.h:5,
|
||
|
|
from linux.c:21:
|
||
|
|
/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo'
|
||
|
|
struct sysinfo {
|
||
|
|
^~~~~~~
|
||
|
|
In file included from linux.c:19:
|
||
|
|
/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here
|
||
|
|
struct sysinfo {
|
||
|
|
^~~~~~~
|
||
|
|
CC mini_snmpd-globals.o
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
- http://autobuild.buildroot.org/results/6903a0f685076b4a2c2824de6158da40e9e712d8
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Retrieved from:
|
||
|
|
https://github.com/troglobit/mini-snmpd/commit/73fa408f51ec25121075aaccac9c9db1c68567cd]
|
||
|
|
---
|
||
|
|
linux.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/linux.c b/linux.c
|
||
|
|
index a657912..86a7085 100644
|
||
|
|
--- a/linux.c
|
||
|
|
+++ b/linux.c
|
||
|
|
@@ -18,7 +18,6 @@
|
||
|
|
#include <netpacket/packet.h>
|
||
|
|
#include <sys/sysinfo.h>
|
||
|
|
#include <sys/socket.h>
|
||
|
|
-#include <linux/if_link.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
#include <sys/types.h>
|
||
|
|
#include <sys/time.h>
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|