diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-23 15:31:28 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-24 17:01:06 +0000 |
| commit | 136b13eb6a682222e2af887d3247a61310476c70 (patch) | |
| tree | 483cc3817645df73200041d9420ea52635ec8a48 /meta | |
| parent | d3de5f7308b4a42b809884119a670af5bedde38f (diff) | |
| download | openembedded-core-136b13eb6a682222e2af887d3247a61310476c70.tar.gz | |
qemu: enable building qemu-nativesdk without x11
Allow building for nativesdk with x11 removed from DISTRO_FEATURES
by conditionally disabling qemugl (which requires X).
Fixes [YOCTO #2020]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_0.15.1.bb | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 33abf96f6c..27ce14d92a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -57,7 +57,8 @@ do_install () { } DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk glib-2.0-nativesdk" +DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'qemugl-nativesdk', '', d)}" RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls" diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb index 3a6389b8af..b6a229486a 100644 --- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb +++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb @@ -3,7 +3,7 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -PR = "r2" +PR = "r3" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}" @@ -36,10 +36,17 @@ SRC_URI_append_virtclass-native = "\ " SRC_URI_append_virtclass-nativesdk = "\ - ${QEMUGLPATCHES} \ - file://glflags.patch \ + ${@base_contains('DISTRO_FEATURES', 'x11', '${QEMUGLPATCHES} file://glflags.patch', '', d)} \ " SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed" SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba" S = "${WORKDIR}/qemu-${PV}" + +do_configure_prepend_virtclass-nativesdk() { + if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then + # Undo the -lX11 added by linker-flags.patch + sed -i 's/-lX11//g' Makefile.target + fi +} + |