diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2011-09-21 17:27:43 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2011-09-21 17:27:43 +0000 |
| commit | 19e75239c6d25414cac7667bd437ede47802a238 (patch) | |
| tree | 96dedc4fa3c4ffefe16fd8b80f0ec267b5407119 /app-emulation/xen-tools/files | |
| parent | remove old (diff) | |
| download | gentoo-2-19e75239c6d25414cac7667bd437ede47802a238.tar.gz gentoo-2-19e75239c6d25414cac7667bd437ede47802a238.tar.bz2 gentoo-2-19e75239c6d25414cac7667bd437ede47802a238.zip | |
[app-emulation/xen-tools] Fix borken emerge due to system header changes; bug #379815. Input from Ian Delaney aka idell4
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/xen-tools/files')
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch | 16 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch | 18 |
2 files changed, 34 insertions, 0 deletions
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch new file mode 100644 index 000000000000..cdcf5fecadee --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch @@ -0,0 +1,16 @@ +--- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800 ++++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800 +@@ -195,8 +195,13 @@ + pid_t pid; + } msg_pid_t; + ++#ifndef READ + #define READ 0 ++#endif ++ ++ifndef WRITE + #define WRITE 1 ++#endif + + /*Control Messages between manager and tapdev*/ + #define CTLMSG_PARAMS 1 diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch new file mode 100644 index 000000000000..5538cc2fb594 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch @@ -0,0 +1,18 @@ +--- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800 ++++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800 +@@ -40,6 +40,7 @@ + #include <err.h> + #include <errno.h> + #include <sys/types.h> ++#include <sys/stat.h> + #include <sys/wait.h> + #include <signal.h> + #include <fcntl.h> +--- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800 ++++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800 +@@ -26,6 +26,7 @@ + #include <zlib.h> + #include "aes.h" + #include <assert.h> ++#include <sys/stat.h> + |