From bd33f87395eb241ea648ba8812e898456d4c29da Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 12 Jul 2016 09:23:30 +0200 Subject: host-qemu: fix building with older glibc Signed-off-by: Michael Olbrich --- ...y-helper-make-sure-sys-xattr.h-is-include.patch | 37 ++++++++++++++++++++++ patches/qemu-2.6.0/series | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 patches/qemu-2.6.0/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch create mode 100644 patches/qemu-2.6.0/series diff --git a/patches/qemu-2.6.0/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch b/patches/qemu-2.6.0/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch new file mode 100644 index 000000000..af36f80dc --- /dev/null +++ b/patches/qemu-2.6.0/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch @@ -0,0 +1,37 @@ +From: Michael Olbrich +Date: Tue, 12 Jul 2016 09:20:19 +0200 +Subject: [PATCH] virtfs-proxy-helper: make sure sys/xattr.h is included first + +Otherwise building with older glibc versions fails with: + +In file included from [...]/include/qemu/xattr.h:26:0, + from fsdev/virtfs-proxy-helper.c:26: +/usr/include/i386-linux-gnu/sys/xattr.h:32:3: error: expected identifier before numeric constant +make[1]: *** [fsdev/virtfs-proxy-helper.o] Error 1 +make[1]: *** Waiting for unfinished jobs.... + +Signed-off-by: Michael Olbrich +--- + fsdev/virtfs-proxy-helper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c +index 54f7ad1c48f0..1f35a300ef89 100644 +--- a/fsdev/virtfs-proxy-helper.c ++++ b/fsdev/virtfs-proxy-helper.c +@@ -9,6 +9,7 @@ + * the COPYING file in the top-level directory. + */ + ++#include "qemu/xattr.h" + #include "qemu/osdep.h" + #include + #include +@@ -23,7 +24,6 @@ + #endif + #include "qemu-common.h" + #include "qemu/sockets.h" +-#include "qemu/xattr.h" + #include "9p-iov-marshal.h" + #include "hw/9pfs/9p-proxy.h" + #include "fsdev/9p-iov-marshal.h" diff --git a/patches/qemu-2.6.0/series b/patches/qemu-2.6.0/series new file mode 100644 index 000000000..d75605a51 --- /dev/null +++ b/patches/qemu-2.6.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch +# a753cda2e5a192fa9d98ad4963e0b67c - git-ptx-patches magic -- cgit v1.2.3