aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-11-24 17:32:34 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-22 19:04:02 +0200
commitf84b5132660b2e3f2536ca777e59e3ce3dab13ab (patch)
tree5d79c9d718a887270fe136c641eaa46ab56b23ec
parentb519be1c522da3983277514a81dd83149737fbce (diff)
downloadupstream-f84b5132660b2e3f2536ca777e59e3ce3dab13ab.tar.gz
upstream-f84b5132660b2e3f2536ca777e59e3ce3dab13ab.tar.bz2
upstream-f84b5132660b2e3f2536ca777e59e3ce3dab13ab.zip
bpftools: fix compilation with musl 1.2.x
A definition for __maybe_inline is needed. Refreshed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
-rw-r--r--package/network/utils/bpftools/patches/006-musl-120.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/network/utils/bpftools/patches/006-musl-120.patch b/package/network/utils/bpftools/patches/006-musl-120.patch
new file mode 100644
index 0000000000..53be466f0b
--- /dev/null
+++ b/package/network/utils/bpftools/patches/006-musl-120.patch
@@ -0,0 +1,20 @@
+--- a/tools/bpf/bpftool/btf_dumper.c
++++ b/tools/bpf/bpftool/btf_dumper.c
+@@ -5,6 +5,7 @@
+ #include <stdio.h> /* for (FILE *) used by json_writer */
+ #include <string.h>
+ #include <unistd.h>
++#include <linux/compiler.h>
+ #include <asm/byteorder.h>
+ #include <linux/bitops.h>
+ #include <linux/btf.h>
+--- a/tools/bpf/bpftool/map_perf_ring.c
++++ b/tools/bpf/bpftool/map_perf_ring.c
+@@ -16,6 +16,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <linux/bpf.h>
++#include <linux/compiler.h>
+ #include <linux/perf_event.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>