diff options
| author |   Paul Eggleton <paul.eggleton@intel.com> | 2010-11-19 15:03:32 +0000 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-11-28 14:39:19 +0000 |
| commit | 144d1b525dabc7b62c5b390c7f214c564d794425 (patch) | |
| tree | 4b71dfa1d5ebfc364d470dfa5269ed200615d353 /meta/recipes-devtools/qemu | |
| parent | 91ef6ae3fc81cf2558104d3372d62f25880ad906 (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'meta/recipes-devtools/qemu')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_0.12.4.bb | 3 |
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 @@ +In native builds, qemu can fail to find zlib development files in the native +sysroot and the build machine might not have zlib-dev packages installed. + +Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are +added and files in the sysroot can be found. + +Patch from Paul Eggleton, Comments by RP 28/11/10 + +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 $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 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 @@ 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 () { |