diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-09-06 15:22:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 13:01:55 +0100 |
commit | 11432c69fa396eaad3eb5bd1644e9c86b80b5e55 (patch) | |
tree | 23ff736edd81ad50969cb9a68e6c95af8c182b17 /meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch | |
parent | f6cc0772504f3af0869f31abb0da0e5686c61aa8 (diff) | |
download | poky-11432c69fa396eaad3eb5bd1644e9c86b80b5e55.tar.gz |
qemu: Update from 0.15 to 1.2
Forward port the patches which were not applied upstream
(From OE-Core rev: 0c1328a27881f1b3046ed527447608a9fa91b1ea)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch new file mode 100644 index 0000000000..ef77c92842 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | In native builds, qemu can fail to find zlib development files in the native | ||
2 | sysroot and the build machine might not have zlib-dev packages installed. | ||
3 | |||
4 | Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are | ||
5 | added and files in the sysroot can be found. | ||
6 | |||
7 | Patch from Paul Eggleton, Comments by RP 28/11/10 | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | Index: qemu-1.2.0/configure | ||
12 | =================================================================== | ||
13 | --- qemu-1.2.0.orig/configure 2012-09-05 07:03:06.000000000 -0700 | ||
14 | +++ qemu-1.2.0/configure 2012-09-06 13:55:07.007793823 -0700 | ||
15 | @@ -281,6 +281,7 @@ | ||
16 | QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" | ||
17 | QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" | ||
18 | QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" | ||
19 | +QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" | ||
20 | if test "$debug_info" = "yes"; then | ||
21 | CFLAGS="-g $CFLAGS" | ||
22 | LDFLAGS="-g $LDFLAGS" | ||