diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2013-08-06 17:04:53 +0300 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-08-09 08:54:46 -0700 |
| commit | 67b6d8d9f987a59090a9a8af61cf740207703dff (patch) | |
| tree | f8af3583a58f55ac27b2e9098aa2539d97355b84 | |
| parent | ba9b3465bcd639a78328e9d2540c14cddf53cae5 (diff) | |
| download | openembedded-core-67b6d8d9f987a59090a9a8af61cf740207703dff.tar.gz openembedded-core-67b6d8d9f987a59090a9a8af61cf740207703dff.tar.bz2 openembedded-core-67b6d8d9f987a59090a9a8af61cf740207703dff.zip | |
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.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-devtools/qemu/files/fix-configure-checks.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 4 |
2 files changed, 1 insertions, 25 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 @@ -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" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index c43f1ef8a0..72988f513f 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -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() { |