From 524b6b85595274ca13bd7d01adb61ce2dddd786c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 8 Sep 2016 20:46:58 +0200 Subject: [PATCH] package/qemu: fix build of host variant The Qemu buildsystem expects that the cpp it is passed can be called like it were cc: it passes it the '-c' option, which is not allowed by cpp, but is allowed for cc. Fix that by overriding CPP when calling configure. Note: the target variant of Qemu does not build the affected parts (the PC-BIOS images). This is another problem that should be fixed separately. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 42dd9c2991..9815f76cf2 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -110,16 +110,19 @@ HOST_QEMU_OPTS += --enable-vde HOST_QEMU_DEPENDENCIES += host-vde2 endif +# Override CPP, as it expects to be able to call it like it'd +# call the compiler. define HOST_QEMU_CONFIGURE_CMDS - cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \ - --target-list="$(HOST_QEMU_TARGETS)" \ - --prefix="$(HOST_DIR)/usr" \ - --interp-prefix=$(STAGING_DIR) \ - --cc="$(HOSTCC)" \ - --host-cc="$(HOSTCC)" \ - --python=$(HOST_DIR)/usr/bin/python2 \ - --extra-cflags="$(HOST_CFLAGS)" \ - --extra-ldflags="$(HOST_LDFLAGS)" \ + cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \ + ./configure \ + --target-list="$(HOST_QEMU_TARGETS)" \ + --prefix="$(HOST_DIR)/usr" \ + --interp-prefix=$(STAGING_DIR) \ + --cc="$(HOSTCC)" \ + --host-cc="$(HOSTCC)" \ + --python=$(HOST_DIR)/usr/bin/python2 \ + --extra-cflags="$(HOST_CFLAGS)" \ + --extra-ldflags="$(HOST_LDFLAGS)" \ $(HOST_QEMU_OPTS) endef