1*4882a593SmuzhiyunFrom 73fa408f51ec25121075aaccac9c9db1c68567cd Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 12 Mar 2020 10:02:18 +0100 4*4882a593SmuzhiyunSubject: [PATCH] linux.c: fix musl build 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunRemove include on linux/if_link.h to avoid the following build failure 7*4882a593Smuzhiyunwith musl: 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunIn file included from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, 10*4882a593Smuzhiyun from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:4, 11*4882a593Smuzhiyun from /home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/if_link.h:5, 12*4882a593Smuzhiyun from linux.c:21: 13*4882a593Smuzhiyun/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' 14*4882a593Smuzhiyun struct sysinfo { 15*4882a593Smuzhiyun ^~~~~~~ 16*4882a593SmuzhiyunIn file included from linux.c:19: 17*4882a593Smuzhiyun/home/buildroot/autobuild/instance-2/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here 18*4882a593Smuzhiyun struct sysinfo { 19*4882a593Smuzhiyun ^~~~~~~ 20*4882a593Smuzhiyun CC mini_snmpd-globals.o 21*4882a593Smuzhiyun 22*4882a593SmuzhiyunFixes: 23*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/6903a0f685076b4a2c2824de6158da40e9e712d8 24*4882a593Smuzhiyun 25*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 26*4882a593Smuzhiyun[Retrieved from: 27*4882a593Smuzhiyunhttps://github.com/troglobit/mini-snmpd/commit/73fa408f51ec25121075aaccac9c9db1c68567cd] 28*4882a593Smuzhiyun--- 29*4882a593Smuzhiyun linux.c | 1 - 30*4882a593Smuzhiyun 1 file changed, 1 deletion(-) 31*4882a593Smuzhiyun 32*4882a593Smuzhiyundiff --git a/linux.c b/linux.c 33*4882a593Smuzhiyunindex a657912..86a7085 100644 34*4882a593Smuzhiyun--- a/linux.c 35*4882a593Smuzhiyun+++ b/linux.c 36*4882a593Smuzhiyun@@ -18,7 +18,6 @@ 37*4882a593Smuzhiyun #include <netpacket/packet.h> 38*4882a593Smuzhiyun #include <sys/sysinfo.h> 39*4882a593Smuzhiyun #include <sys/socket.h> 40*4882a593Smuzhiyun-#include <linux/if_link.h> 41*4882a593Smuzhiyun #include <sys/ioctl.h> 42*4882a593Smuzhiyun #include <sys/types.h> 43*4882a593Smuzhiyun #include <sys/time.h> 44*4882a593Smuzhiyun-- 45*4882a593Smuzhiyun2.25.1 46*4882a593Smuzhiyun 47