package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch

4 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc
9 The reason is to avoid indirect <linux/sysinfo.h> include when using
11 -> <linux/sysinfo.h>
13 This indirect include causes on MUSL redefinition of struct sysinfo when
14 included both <sys/sysinfo.h> and some of UAPI headers:
20 …64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of ‘struct sy…
21  struct sysinfo {
26 x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here
44  include/lapi/sysinfo.h                        | 22 +++++++++++++++++++
50  testcases/kernel/syscalls/sysinfo/sysinfo01.c |  2 +-
51  testcases/kernel/syscalls/sysinfo/sysinfo02.c |  2 +-
52  testcases/kernel/syscalls/sysinfo/sysinfo03.c |  2 +-
55  create mode 100644 include/lapi/sysinfo.h
57 diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h
61 +++ b/include/lapi/sysinfo.h
71 + * Don't use <sys/sysinfo.h> as it breaks build MUSL toolchain.
72 + * Use <linux/sysinfo.h> instead.
74 + * Some kernel UAPI headers do indirect <linux/sysinfo.h> include:
75 + * <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>
77 + * This indirect include causes on MUSL redefinition of struct sysinfo when
78 + * included both <sys/sysinfo.h> and some of UAPI headers:
80 +#include <linux/sysinfo.h>
93 -#include <sys/sysinfo.h>
94 +#include <linux/sysinfo.h>
106 -#include <sys/sysinfo.h>
114 +#include "lapi/sysinfo.h"
126 -#include <sys/sysinfo.h>
131 +#include "lapi/sysinfo.h"
143 -#include <sys/sysinfo.h>
151 +#include "lapi/sysinfo.h"
163 -#include <sys/sysinfo.h>
164 +#include "lapi/sysinfo.h"
168 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysi…
170 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
171 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
176 -#include <sys/sysinfo.h>
177 +#include "lapi/sysinfo.h"
181 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysi…
183 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
184 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
189 -#include <sys/sysinfo.h>
190 +#include "lapi/sysinfo.h"
194 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysi…
196 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c
197 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
202 -#include <sys/sysinfo.h>
203 +#include "lapi/sysinfo.h"
215 -#include <sys/sysinfo.h>
216 +#include "lapi/sysinfo.h"