summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-07-12 09:23:30 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-07-12 09:23:30 +0200
commitbd33f87395eb241ea648ba8812e898456d4c29da (patch)
tree91a57bf6a682726b4559de78686e67ac92f2061f
parent48061e2ddd2c959e7024c96a24d9ecf6f6d5552f (diff)
downloadptxdist-bd33f87395eb241ea648ba8812e898456d4c29da.tar.gz
host-qemu: fix building with older glibc
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/qemu-2.6.0/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch37
-rw-r--r--patches/qemu-2.6.0/series4
2 files changed, 41 insertions, 0 deletions
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 0000000..af36f80
--- /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 <m.olbrich@pengutronix.de>
+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 <m.olbrich@pengutronix.de>
+---
+ 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 <sys/resource.h>
+ #include <getopt.h>
+@@ -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 0000000..d75605a
--- /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