diff options
Diffstat (limited to 'package/qemu')
| -rw-r--r-- | package/qemu/Makefile | 7 | ||||
| -rw-r--r-- | package/qemu/patches/patch-linux-user_syscall_c | 22 |
2 files changed, 26 insertions, 3 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 48cb6e82b..b03a3ca59 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,13 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 1.6.1 +PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3a897d722457c5a895cd6ac79a28fda0 +PKG_MD5SUM:= 32893941d40d052a5e649efcf06aca06 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc PKG_DEPENDS:= zlib libsdl libpng -PKG_BUILDDEP:= glib-host qemu-host zlib sdl libpng +PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host qemu-host zlib sdl libpng PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ HOST_STYLE:= manual HOST_CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --disable-docs \ + --disable-werror \ --disable-system \ --disable-sdl diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c new file mode 100644 index 000000000..1eba70417 --- /dev/null +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -0,0 +1,22 @@ +--- qemu-1.7.0.orig/linux-user/syscall.c 2013-11-27 23:15:55.000000000 +0100 ++++ qemu-1.7.0/linux-user/syscall.c 2014-01-31 09:51:34.051058876 +0100 +@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch + #include <netinet/ip.h> + #include <netinet/tcp.h> + #include <linux/wireless.h> ++#include <linux/version.h> + #include <linux/icmp.h> + #include "qemu-common.h" + #ifdef TARGET_GPROF +@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch + #include <linux/utsname.h> + #include <linux/cdrom.h> + #include <linux/hdreg.h> ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0) + #include <linux/soundcard.h> ++#else ++#include <linux/soundcard.h.oss3> ++#endif + #include <linux/kd.h> + #include <linux/mtio.h> + #include <linux/fs.h> |