From 4688b3a7e20578a761b7e54a392814323c8e4200 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 19 Aug 2017 22:55:26 +0200 Subject: [PATCH] kvmtool: add patch to fix build with musl This commit backports an upstream patch that fixes the build of kvmtool with musl: In file included from builtin-balloon.c:9:0: include/kvm/kvm.h:22:0: warning: "PAGE_SIZE" redefined #define PAGE_SIZE (sysconf(_SC_PAGE_SIZE)) Fixes one part of: http://autobuild.buildroot.net/results/4459a909e735343d1cf768d30466bc3c57eca19e/ Signed-off-by: Thomas Petazzoni Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-avoid-redefining-PAGE_SIZE.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/kvmtool/0001-avoid-redefining-PAGE_SIZE.patch diff --git a/package/kvmtool/0001-avoid-redefining-PAGE_SIZE.patch b/package/kvmtool/0001-avoid-redefining-PAGE_SIZE.patch new file mode 100644 index 0000000000..ed3370cfc8 --- /dev/null +++ b/package/kvmtool/0001-avoid-redefining-PAGE_SIZE.patch @@ -0,0 +1,42 @@ +From bec1b0ced72dc0d49825d6b69d09296d13fd0af3 Mon Sep 17 00:00:00 2001 +From: Andre Przywara +Date: Tue, 21 Jul 2015 10:58:46 +0100 +Subject: [PATCH] avoid redefining PAGE_SIZE + +PAGE_SIZE may have been defined by the C libary (musl-libc does that). +So avoid redefining it here unconditionally, instead only use our +definition if none has been provided by the libc. + +Signed-off-by: Andre Przywara +Signed-off-by: Will Deacon +[backport from upstream commit 4095fac878f618ae5e7384a1dc65ee34b6e05217.] +Signed-off-by: Thomas Petazzoni +--- + include/kvm/kvm.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h +index 754e029..37155db 100644 +--- a/include/kvm/kvm.h ++++ b/include/kvm/kvm.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #define SIGKVMEXIT (SIGRTMIN + 0) + #define SIGKVMPAUSE (SIGRTMIN + 1) +@@ -19,7 +20,9 @@ + #define HOME_DIR getenv("HOME") + #define KVM_BINARY_NAME "lkvm" + ++#ifndef PAGE_SIZE + #define PAGE_SIZE (sysconf(_SC_PAGE_SIZE)) ++#endif + + #define DEFINE_KVM_EXT(ext) \ + .name = #ext, \ +-- +2.9.4 + -- 2.30.2