sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Riku Voipio 2013-08-06 17:04:53 +03:00 committed by Richard Purdie
parent afd80c0569
commit 290a5aef1f
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-devtools/qemu/files/fix-configure-checks.patch
View File

@ -1,22 +0,0 @@
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
Upstream-Status: Inappropriate [embedded specific]
Index: qemu-1.4.0/configure
===================================================================
--- qemu-1.4.0.orig/configure 2013-02-15 15:05:35.000000000 -0800
+++ qemu-1.4.0/configure 2013-02-25 13:44:17.915273181 -0800
@@ -286,6 +286,7 @@
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
LDFLAGS="-g $LDFLAGS"

4
meta/recipes-devtools/qemu/qemu.inc
View File

@ -16,7 +16,6 @@ QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
SRC_URI = "\
file://powerpc_rom.bin \
file://no-strip.patch \
file://fix-configure-checks.patch \
file://larger_default_ram_size.patch \
"
@ -28,12 +27,11 @@ SRC_URI_append_class-native = "\
file://fix-libcap-header-issue-on-some-distro.patch \
"
EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman"
EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'"
EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
--disable-curl \
"
export LIBTOOL="${HOST_SYS}-libtool"
do_configure_prepend_class-native() {