[oe-commits] Dmitry Eremin-Solenikov : qemu: fix the fix for qemu-native vs. no zlib on host

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 330d29167fa1267fb3504107a66e22b84f86d7e5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=330d29167fa1267fb3504107a66e22b84f86d7e5

Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date:   Wed Jun  2 18:03:07 2010 +0400

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 <dbaryshkov at gmail.com>

---

 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 db9155c..9ee512d 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 6bc5868..7013702 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}