From 330d29167fa1267fb3504107a66e22b84f86d7e5 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Wed, 2 Jun 2010 18:03:07 +0400 Subject: [PATCH] qemu: fix the fix for qemu-native vs. no zlib on host Make the qemu virtual:native build to pass staging dir via EXTRA_OECONF, not via QEMU_CFLAGS, which aren't passed to configure environment. Signed-off-by: Dmitry Eremin-Solenikov --- recipes/qemu/qemu_0.12.3.bb | 6 ++---- recipes/qemu/qemu_0.12.4.bb | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/recipes/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb index db9155c4e3..9ee512d31d 100644 --- a/recipes/qemu/qemu_0.12.3.bb +++ b/recipes/qemu/qemu_0.12.3.bb @@ -32,11 +32,9 @@ S = "${WORKDIR}/qemu-${PV}" EXTRA_OECONF += " --disable-curl --disable-sdl --disable-strip" -inherit autotools +EXTRA_OECONF_append_virtclass-native += " --extra-cflags="-I${STAGING_INCDIR_NATIVE}"" -do_configure_prepend_virtclass-native() { - export QEMU_CFLAGS="-I${STAGING_INCDIR_NATIVE} ${QEMU_CFLAGS}" -} +inherit autotools do_configure() { ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} diff --git a/recipes/qemu/qemu_0.12.4.bb b/recipes/qemu/qemu_0.12.4.bb index 6bc5868f64..7013702d9f 100644 --- a/recipes/qemu/qemu_0.12.4.bb +++ b/recipes/qemu/qemu_0.12.4.bb @@ -29,11 +29,9 @@ S = "${WORKDIR}/qemu-${PV}" EXTRA_OECONF += " --disable-curl --disable-sdl --disable-strip \ " -inherit autotools +EXTRA_OECONF_append_virtclass-native += " --extra-cflags="-I${STAGING_INCDIR_NATIVE}"" -do_configure_prepend_virtclass-native() { - export QEMU_CFLAGS="-I${STAGING_INCDIR_NATIVE} ${QEMU_CFLAGS}" -} +inherit autotools do_configure() { ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} -- 2.39.5