diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2013-08-06 17:04:53 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-12 13:09:52 +0100 |
| commit | 290a5aef1f1de389d2c6432e659627f229cc44fb (patch) | |
| tree | 39c2a303734ec8dd4bcef52fbf7fcd7458792a39 /meta/recipes-devtools/qemu/files/fix-configure-checks.patch | |
| parent | afd80c05691efff43bdee86b5fba7f6cb1adfedc (diff) | |
| download | poky-290a5aef1f1de389d2c6432e659627f229cc44fb.tar.gz | |
qemu: pass CFLAGS via ./configure instead of a patch
OE carries a patch to pass CFLAGS to qemu. However, we can avoid
patching by passing CFLAGS with qemu's --extra-cflags option.
Tested that building qemu-native still works without zlib-dev
on host, and that qemu builds.
(From OE-Core rev: 67b6d8d9f987a59090a9a8af61cf740207703dff)
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
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/files/fix-configure-checks.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/files/fix-configure-checks.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch deleted file mode 100644 index 294c22019d..0000000000 --- a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 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.4.0/configure | ||
| 12 | =================================================================== | ||
| 13 | --- qemu-1.4.0.orig/configure 2013-02-15 15:05:35.000000000 -0800 | ||
| 14 | +++ qemu-1.4.0/configure 2013-02-25 13:44:17.915273181 -0800 | ||
| 15 | @@ -286,6 +286,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)/include" | ||
| 19 | +QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" | ||
| 20 | if test "$debug_info" = "yes"; then | ||
| 21 | CFLAGS="-g $CFLAGS" | ||
| 22 | LDFLAGS="-g $LDFLAGS" | ||
