diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-02 21:04:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-02 21:04:08 +0200 |
| commit | fbe5f563db24f5fa7eb24065c89557033a7547a2 (patch) | |
| tree | 1208e624036bd6434dbdf03c06ad03d5c829bcf1 /package/qemu | |
| parent | 830cbab2bf7c28ce2de623fc06350a1030106200 (diff) | |
| parent | cf494122e89c1f3674079ad3de3604f8d8e94b0b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/qemu')
| -rw-r--r-- | package/qemu/Makefile | 14 | ||||
| -rw-r--r-- | package/qemu/patches/patch-linux-user_syscall_c | 16 | ||||
| -rw-r--r-- | package/qemu/patches/patch-util_qemu-openpty_c | 11 |
3 files changed, 29 insertions, 12 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 4c2067ac9..6ca93afa3 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,13 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 1.7.0 +PKG_VERSION:= 1.7.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 32893941d40d052a5e649efcf06aca06 +PKG_MD5SUM:= 9541063d999cf9659ed7fdce71314f31 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc -PKG_DEPENDS:= zlib libsdl libpng -PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host qemu-host zlib sdl libpng +PKG_DEPENDS:= zlib glib +PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host +PKG_BUILDDEP+= qemu-host zlib glib PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -24,17 +25,18 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -TARGET_LDFLAGS+= -pthread -lm -lrt CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ + --cross-prefix=$(GNU_TARGET_NAME)- \ --prefix=/usr \ --sysconfdir=/etc \ --enable-kvm \ --disable-docs \ + --disable-sdl \ --bindir=/usr/bin HOST_STYLE:= manual +CFLAGS_FOR_BUILD+= -DNATIVE HOST_CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --disable-docs \ --disable-werror \ diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c index 1eba70417..aa243b148 100644 --- a/package/qemu/patches/patch-linux-user_syscall_c +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -1,22 +1,26 @@ ---- 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 +--- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100 ++++ qemu-1.7.1/linux-user/syscall.c 2014-04-02 16:56:13.483513278 +0200 +@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch + //#include <sys/user.h> #include <netinet/ip.h> #include <netinet/tcp.h> - #include <linux/wireless.h> +#include <linux/version.h> + #include <linux/wireless.h> #include <linux/icmp.h> #include "qemu-common.h" - #ifdef TARGET_GPROF -@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch +@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch #include <linux/utsname.h> #include <linux/cdrom.h> #include <linux/hdreg.h> ++#ifdef NATIVE +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0) #include <linux/soundcard.h> +#else +#include <linux/soundcard.h.oss3> +#endif ++#else ++#include <linux/soundcard.h> ++#endif #include <linux/kd.h> #include <linux/mtio.h> #include <linux/fs.h> diff --git a/package/qemu/patches/patch-util_qemu-openpty_c b/package/qemu/patches/patch-util_qemu-openpty_c new file mode 100644 index 000000000..ed524628a --- /dev/null +++ b/package/qemu/patches/patch-util_qemu-openpty_c @@ -0,0 +1,11 @@ +--- qemu-1.7.0.orig/util/qemu-openpty.c 2013-11-27 23:15:55.000000000 +0100 ++++ qemu-1.7.0/util/qemu-openpty.c 2014-03-14 09:05:17.280258135 +0100 +@@ -35,7 +35,7 @@ + #include "config-host.h" + #include "qemu-common.h" + +-#if defined(__GLIBC__) ++#if defined(__linux__) + # include <pty.h> + #elif defined CONFIG_BSD + # include <termios.h> |