tools/qemu: use default host configure rule ; set appropriate vars & args

[openwrt/openwrt.git] / tools / qemu / Makefile

diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 7d4eb0b30cb0daff90183f84927077660f1dd01d..783d0f9fad630a78f7fa12225b689eabdc6a4544 100644 (file)
--- a/tools/qemu/Makefile
+++ b/tools/qemu/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,29 +7,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qemu
-PKG_VERSION:=0.12.5
+PKG_VERSION:=0.14.1
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/qemu/
+PKG_SOURCE_URL:=@SAVANNAH/qemu
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=1d02ee0a04dfae2894340273372c1de4
+PKG_HASH:=33ceae3fbe516f2cbb151dc98d16c8ccfec74b1056674ad715e75a2f7fed45c3
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Configure
-       (cd $(HOST_BUILD_DIR); \
-               CFLAGS="$(HOST_CFLAGS)" \
-               LDFLAGS="$(HOST_LDFLAGS)" \
-               $(HOST_CONFIGURE_CMD) \
-               --extra-cflags="$(HOST_CFLAGS)" \
-               --enable-uuid \
-       )
-endef
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
+
+HOST_CONFIGURE_VARS := \
+       CFLAGS="$(HOST_CFLAGS)" \
+       LDFLAGS="$(HOST_LDFLAGS)"
+
+HOST_CONFIGURE_ARGS := \
+       --extra-cflags="$(HOST_CFLAGS)" \
+       --enable-uuid
 
 define Host/Compile
-       (cd $(HOST_BUILD_DIR); \
-               make qemu-img \
-       )
+       $(MAKE) -C $(HOST_BUILD_DIR) qemu-img
 endef
 
 define Host/Install