diff options
Diffstat (limited to 'package/qemu')
| -rw-r--r-- | package/qemu/Makefile | 9 | ||||
| -rw-r--r-- | package/qemu/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/qemu/patches/patch-hw_vhost_c | 10 | ||||
| -rw-r--r-- | package/qemu/patches/patch-hw_vhost_net_c | 10 |
4 files changed, 38 insertions, 2 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 1bafddc94..4b8c33c9c 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -5,11 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu PKG_VERSION:= 0.13.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 397a0d665da8ba9d3b9583629f3d6421 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc -PKG_BUILDDEP:= zlib +PKG_DEPENDS:= zlib libSDL +PKG_BUILDDEP:= zlib sdl PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -24,10 +25,14 @@ CONFIGURE_ARGS+= --host-cc=$(HOSTCC) \ --prefix=/usr \ --sysconfdir=/etc \ --bindir=/usr/bin +TLDFLAGS+= -pthread -lrt post-install: + $(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu $(INSTALL_DIR) $(IDIR_QEMU)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/qemu* \ $(IDIR_QEMU)/usr/bin + $(CP) $(WRKINST)/usr/share/qemu/* \ + $(IDIR_QEMU)/usr/share/qemu include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/qemu/patches/patch-configure b/package/qemu/patches/patch-configure new file mode 100644 index 000000000..963c407fe --- /dev/null +++ b/package/qemu/patches/patch-configure @@ -0,0 +1,11 @@ +--- qemu-0.13.0.orig/configure 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/configure 2011-01-12 22:34:59.000000000 +0100 +@@ -136,7 +136,7 @@ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_C + QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS" + LDFLAGS="-g $LDFLAGS" + +-gcc_flags="-Wold-style-declaration -Wold-style-definition -fstack-protector-all" ++gcc_flags="-Wold-style-declaration -Wold-style-definition" + cat > $TMPC << EOF + int main(void) { return 0; } + EOF diff --git a/package/qemu/patches/patch-hw_vhost_c b/package/qemu/patches/patch-hw_vhost_c new file mode 100644 index 000000000..71eccb83f --- /dev/null +++ b/package/qemu/patches/patch-hw_vhost_c @@ -0,0 +1,10 @@ +--- qemu-0.13.0.orig/hw/vhost.c 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/hw/vhost.c 2011-01-12 21:27:10.000000000 +0100 +@@ -11,7 +11,6 @@ + */ + + #include <sys/ioctl.h> +-#include <sys/eventfd.h> + #include "vhost.h" + #include "hw/hw.h" + /* For range_get_last */ diff --git a/package/qemu/patches/patch-hw_vhost_net_c b/package/qemu/patches/patch-hw_vhost_net_c new file mode 100644 index 000000000..325d5a940 --- /dev/null +++ b/package/qemu/patches/patch-hw_vhost_net_c @@ -0,0 +1,10 @@ +--- qemu-0.13.0.orig/hw/vhost_net.c 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/hw/vhost_net.c 2011-01-12 21:27:20.000000000 +0100 +@@ -20,7 +20,6 @@ + + #ifdef CONFIG_VHOST_NET + #include <linux/vhost.h> +-#include <sys/eventfd.h> + #include <sys/socket.h> + #include <linux/kvm.h> + #include <fcntl.h> |