diff options
author | wbx <wbx@openadk.org> | 2011-04-08 12:37:48 +0200 |
---|---|---|
committer | wbx <wbx@openadk.org> | 2011-04-08 12:37:48 +0200 |
commit | 34fc06736330cc993fd1c936ed9205cdc73aa0fd (patch) | |
tree | 42319fe9aa25f82370948335d6dccd571da945d6 /package/qemu | |
parent | 6ea415c59b9ced9d08be7348d268ae4543017a56 (diff) | |
parent | 297e4004d154572e29ee71f8ed852b022686e852 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/qemu')
-rw-r--r-- | package/qemu/Makefile | 16 | ||||
-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, 8 insertions, 39 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 3ce9d6a19..f82e852b8 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,30 +4,30 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 0.13.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 397a0d665da8ba9d3b9583629f3d6421 +PKG_VERSION:= 0.14.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f9d145d5c09de9f0984ffe9bd1229970 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc -PKG_DEPENDS:= zlib libSDL +PKG_DEPENDS:= zlib libsdl PKG_BUILDDEP:= zlib sdl PKG_URL:= http://wwww.qemu.org/ -PKG_SITES:= http://wiki.qemu.org/download/ +PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/ -PKG_ARCH_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= native x86 x86_64 include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ - --cross-prefix=$(TARGET_CROSS) \ --disable-user \ --prefix=/usr \ --sysconfdir=/etc \ --bindir=/usr/bin -TARGET_LDFLAGS+= -pthread -lrt +TARGET_LDFLAGS+= -pthread -lm -lrt post-install: $(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu diff --git a/package/qemu/patches/patch-configure b/package/qemu/patches/patch-configure deleted file mode 100644 index 963c407fe..000000000 --- a/package/qemu/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 71eccb83f..000000000 --- a/package/qemu/patches/patch-hw_vhost_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 325d5a940..000000000 --- a/package/qemu/patches/patch-hw_vhost_net_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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> |