summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@intel.com>2010-11-19 15:03:32 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-28 14:39:19 +0000
commit144d1b525dabc7b62c5b390c7f214c564d794425 (patch)
tree4b71dfa1d5ebfc364d470dfa5269ed200615d353
parent91ef6ae3fc81cf2558104d3372d62f25880ad906 (diff)
downloadpoky-144d1b525dabc7b62c5b390c7f214c564d794425.tar.gz
qemu: fix failure to find zlib header files during configure
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> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch20
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.12.4.bb3
2 files changed, 22 insertions, 1 deletions
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 0000000000..28ca2b3646
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
@@ -0,0 +1,20 @@
1In native builds, qemu can fail to find zlib development files in the native
2sysroot and the build machine might not have zlib-dev packages installed.
3
4Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are
5added and files in the sysroot can be found.
6
7Patch from Paul Eggleton, Comments by RP 28/11/10
8
9Index: qemu-0.12.4/configure
10===================================================================
11--- qemu-0.12.4.orig/configure
12+++ qemu-0.12.4/configure
13@@ -99,6 +99,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun
14 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
15 QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"
16 QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
17+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
18 LDFLAGS="-g $LDFLAGS"
19
20 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 6e7d86f9c6..ec0d9d2bf8 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 @@
1require qemu.inc 1require qemu.inc
2 2
3PR = "r22" 3PR = "r23"
4 4
5FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 5FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
6FILESDIR = "${WORKDIR}" 6FILESDIR = "${WORKDIR}"
@@ -21,6 +21,7 @@ SRC_URI = "\
21 file://arm-cp15-fix.patch \ 21 file://arm-cp15-fix.patch \
22 file://cursor-shadow-fix.patch \ 22 file://cursor-shadow-fix.patch \
23 file://vmware-vga-fifo-rewind.patch \ 23 file://vmware-vga-fifo-rewind.patch \
24 file://fix-configure-checks.patch \
24 file://powerpc_rom.bin" 25 file://powerpc_rom.bin"
25 26
26do_install_append () { 27do_install_append () {