[PATCH] qemu: fix failure to find zlib header files during configure

[PATCH] qemu: fix failure to find zlib header files during configure

[Paul Eggleton]

Corrects problems during configure of qemu-native due to the BUILD_CFLAGS
not being included when attempting to compile the test program for zlib
within the configure script.

Signed-off-by: Paul Eggleton <paul.eggleton@intel.com>
---
 .../qemu/qemu-0.12.4/fix-configure-checks.patch    |   12 ++++++++++++
 meta/recipes-devtools/qemu/qemu_0.12.4.bb          |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch

diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
new file mode 100644
index 0000000..5d81fc3
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
@@ -0,0 +1,12 @@
+Index: qemu-0.12.4/configure
+===================================================================
+--- qemu-0.12.4.orig/configure
++++ qemu-0.12.4/configure
+@@ -99,6 +99,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun
+ QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
+ QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"
+ QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
++QEMU_CFLAGS="$QEMU_CFLAGS $BUILD_CFLAGS"
+ LDFLAGS="-g $LDFLAGS"
+ 
+ gcc_flags="-Wold-style-declaration -Wold-style-definition"
diff --git a/meta/recipes-devtools/qemu/qemu_0.12.4.bb b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
index 6e7d86f..ec0d9d2 100644
--- a/meta/recipes-devtools/qemu/qemu_0.12.4.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
@@ -1,6 +1,6 @@
 require qemu.inc
 
-PR = "r22"
+PR = "r23"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"
@@ -21,6 +21,7 @@ SRC_URI = "\
     file://arm-cp15-fix.patch \
     file://cursor-shadow-fix.patch \
     file://vmware-vga-fifo-rewind.patch \
+    file://fix-configure-checks.patch \
     file://powerpc_rom.bin"
 
 do_install_append () {
-- 
1.7.3.1

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH] qemu: fix failure to find zlib header files during configure

[Saul Wold]

On 11/19/2010 07:03 AM, Paul Eggleton wrote:
> Corrects problems during configure of qemu-native due to the BUILD_CFLAGS
> not being included when attempting to compile the test program for zlib
> within the configure script.
>
> Signed-off-by: Paul Eggleton<paul.eggleton@intel.com>
> ---
>   .../qemu/qemu-0.12.4/fix-configure-checks.patch    |   12 ++++++++++++
>   meta/recipes-devtools/qemu/qemu_0.12.4.bb          |    3 ++-
>   2 files changed, 14 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
>
> diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
> new file mode 100644
> index 0000000..5d81fc3
> --- /dev/null
> +++ b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
> @@ -0,0 +1,12 @@
> +Index: qemu-0.12.4/configure
> +===================================================================
> +--- qemu-0.12.4.orig/configure
> ++++ qemu-0.12.4/configure
> +@@ -99,6 +99,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun
> + QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
> + QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"
> + QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
> ++QEMU_CFLAGS="$QEMU_CFLAGS $BUILD_CFLAGS"
> + LDFLAGS="-g $LDFLAGS"
> +
> + gcc_flags="-Wold-style-declaration -Wold-style-definition"
> diff --git a/meta/recipes-devtools/qemu/qemu_0.12.4.bb b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
> index 6e7d86f..ec0d9d2 100644
> --- a/meta/recipes-devtools/qemu/qemu_0.12.4.bb
> +++ b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
> @@ -1,6 +1,6 @@
>   require qemu.inc
>
> -PR = "r22"
> +PR = "r23"
>
>   FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
>   FILESDIR = "${WORKDIR}"
> @@ -21,6 +21,7 @@ SRC_URI = "\
>       file://arm-cp15-fix.patch \
>       file://cursor-shadow-fix.patch \
>       file://vmware-vga-fifo-rewind.patch \
> +    file://fix-configure-checks.patch \
>       file://powerpc_rom.bin"
>
>   do_install_append () {

Pulled into Master

Thanks
    Sau!