package/iproute2: fix build with musl libc
PATCH 1/1 package/iproute2: fix build with musl libc
Add a patch fixing collision of definitions between libc and kernel headers.
Fixes:
http://autobuild.buildroot.net/results/d38d3a84c61f37747c652382646839a69de16463/
http://autobuild.buildroot.net/results/41bd8e53b51a96f1b29d7ba0d8661a6dfc958415/
Cc Petr Vorel <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
--- ...ix-libc-and-kernel-headers-collision.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/iproute2/0001-devlink-fix-libc-and-kernel-headers-collision.patch
package/iproute2/0001-devlink-fix-libc-and-kernel-headers-collision.patch new file +51 -0
@@ -0,0 +1,51 @@ +From 602128d22db86bd67e11dec8fe40a73832c222c9 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <[email protected]> +Date: Thu, 30 May 2019 18:22:40 +0300 +Subject: [PATCH] devlink: fix libc and kernel headers collision + +Since commit 2f1242efe9d ("devlink: Add devlink health show command") we +use the sys/sysinfo.h header for the sysinfo(2) system call. But since +iproute2 carries a local version of the kernel struct sysinfo, this +causes a collision with libc that do not rely on kernel defined sysinfo +like musl libc: + +In file included from devlink.c:25:0: +.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo' + struct sysinfo { + ^~~~~~~ +In file included from ../include/uapi/linux/kernel.h:5:0, + from ../include/uapi/linux/netlink.h:5, + from ../include/uapi/linux/genetlink.h:6, + from devlink.c:21: +../include/uapi/linux/sysinfo.h:8:8: note: originally defined here + struct sysinfo { + ^~~~~~~ + +Rely on the kernel header alone to avoid kernel and userspace headers +collision of definitions. + +Cc: Aya Levin <[email protected]> +Cc: Moshe Shemesh <[email protected]> +Signed-off-by: Baruch Siach <[email protected]> +--- +Upstream status: http://patchwork.ozlabs.org/patch/1107817/ + + devlink/devlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/devlink/devlink.c b/devlink/devlink.c +index 436935f88bda..d7a6ce94f0e6 100644 +--- a/devlink/devlink.c ++++ b/devlink/devlink.c +@@ -22,7 +22,7 @@ + #include <linux/devlink.h> + #include <libmnl/libmnl.h> + #include <netinet/ether.h> +-#include <sys/sysinfo.h> ++#include <linux/sysinfo.h> + #include <sys/queue.h> + + #include "SNAPSHOT.h" +-- +2.20.1 +
Signature · 1 line
2.20.1
PATCH 1/1 package/iproute2: fix build with musl libc
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Add a patch fixing collision of definitions between libc and kernel headers.
Fixes:
http://autobuild.buildroot.net/results/d38d3a84c61f37747c652382646839a69de16463/
http://autobuild.buildroot.net/results/41bd8e53b51a96f1b29d7ba0d8661a6dfc958415/Cc Petr Vorel <[email protected]>Signed-off-by Baruch Siach <[email protected]>
Given that these autobuilder results refer to net, committed to next - Thanks.
Signature · 1 line
Bye, Peter Korsgaard