From 6f7884c81461bdb35ff47da9cd84c8a8ca5d57cb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 13 Dec 2012 11:39:37 +0000 Subject: [PATCH] package/qemu: fix host-qemu variable names With the upcoming introduction of qemu-on-target, we need to properly separate the variables used for the host qemu, from the variables used for the target qemu. Signed-off-by: "Yann E. MORIN" Cc: Francois Perrad Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 790d34f532..81cd79f5e1 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -13,7 +13,10 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB # the non-(L)GPL license texts are specified in the affected # individual source files. -QEMU_DEPENDENCIES = host-pkgconf zlib libglib2 +#------------------------------------------------------------- +# Host-qemu + +HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2 # BR ARCH qemu # ------- ---- @@ -44,20 +47,20 @@ QEMU_DEPENDENCIES = host-pkgconf zlib libglib2 # sh64 not supported # sparc sparc -QEMU_ARCH = $(ARCH) -ifeq ($(QEMU_ARCH),i486) - QEMU_ARCH = i386 +HOST_QEMU_ARCH = $(ARCH) +ifeq ($(HOST_QEMU_ARCH),i486) + HOST_QEMU_ARCH = i386 endif -ifeq ($(QEMU_ARCH),i586) - QEMU_ARCH = i386 +ifeq ($(HOST_QEMU_ARCH),i586) + HOST_QEMU_ARCH = i386 endif -ifeq ($(QEMU_ARCH),i686) - QEMU_ARCH = i386 +ifeq ($(HOST_QEMU_ARCH),i686) + HOST_QEMU_ARCH = i386 endif -ifeq ($(QEMU_ARCH),powerpc) - QEMU_ARCH = ppc +ifeq ($(HOST_QEMU_ARCH),powerpc) + HOST_QEMU_ARCH = ppc endif -HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user +HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user define HOST_QEMU_CONFIGURE_CMDS (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \ -- 2.30.2