From fb7a26cbb731aa67e1b2f853d8b4daa598fa112a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Oct 2014 00:38:10 +0200 Subject: [PATCH] package/qemu: do not use autotools for qemu Although QEMU has a ./configure script, it is not an autotools-package, so switch to providing build and install commands, and to using generic-package. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 827bb77bce..9654b9079e 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -59,22 +59,26 @@ ifeq ($(HOST_QEMU_ARCH),powerpc) endif HOST_QEMU_TARGETS = $(HOST_QEMU_ARCH)-linux-user -# Note: although QEMU has a ./configure script, it is not a real autotools -# package, and ./configure chokes on options such as --host or --target. -# So, provide out own _CONFIGURE_CMDS to override the defaults. define HOST_QEMU_CONFIGURE_CMDS - (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \ + cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \ --target-list="$(HOST_QEMU_TARGETS)" \ --prefix="$(HOST_DIR)/usr" \ --interp-prefix=$(STAGING_DIR) \ --cc="$(HOSTCC)" \ --host-cc="$(HOSTCC)" \ --extra-cflags="$(HOST_CFLAGS)" \ - --extra-ldflags="$(HOST_LDFLAGS)" \ - ) + --extra-ldflags="$(HOST_LDFLAGS)" endef -$(eval $(host-autotools-package)) +define HOST_QEMU_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_QEMU_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install +endef + +$(eval $(host-generic-package)) # variable used by other packages QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH) -- 2.30.2