Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / lfs / qemu

diff --git a/lfs/qemu b/lfs/qemu
index 14876b9a52c21e70dc895fb5bd9fa4689736c35d..2fc0476b0a8e5c93bc0264074a3edca341f6641e 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,16 @@
 
 include Config
 
-VER        = 0.9.1
+VER        = 0.15.0
 
-THISAPP    = qemu-$(VER)
+THISAPP    = qemu-kvm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = qemu
-PAK_VER    = 1
+PAK_VER    = 14
 
 DEPS       = "sdl"
 
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6591df8e9270eb358c881de4ebea1262
+$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47
 
 install : $(TARGET)
 
@@ -77,16 +78,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       
-       # Apply a number of patches mainly for gcc 4
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-enforce-16byte-stack-boundary.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-hacks.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-opts.patch
-       
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-gcc-check \
-               --disable-gfx-check --target-list="i386-linux-user i386-softmmu"
-               
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+               --target-list="i386-linux-user i386-softmmu arm-softmmu" \
+               --extra-cflags="$(CFLAGS)"
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)