diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:19:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:19:35 +0100 |
| commit | bf73dab7201f06f26290c4ceb5cdcca603f027d7 (patch) | |
| tree | 580957c39468a87a88cf6346dd3f763355f1333c /package/qemu | |
| parent | 97004f38266b1106bb1823cbbcbd4e63d11210c9 (diff) | |
fix openjdk build, add render dependency
Diffstat (limited to 'package/qemu')
| -rw-r--r-- | package/qemu/Makefile | 5 | ||||
| -rw-r--r-- | package/qemu/patches/patch-linux-user_syscall_c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 48cb6e82b..c45eea716 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,9 +4,9 @@ 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 @@ -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..21c9afef5 --- /dev/null +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -0,0 +1,11 @@ +--- 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-30 12:14:53.751964593 +0100 +@@ -94,7 +94,7 @@ int __clone2(int (*fn)(void *), void *ch + #include <linux/utsname.h> + #include <linux/cdrom.h> + #include <linux/hdreg.h> +-#include <linux/soundcard.h> ++#include <linux/soundcard.h.oss3> + #include <linux/kd.h> + #include <linux/mtio.h> + #include <linux/fs.h> |