summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-23 15:31:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 17:01:44 +0000
commit189a854e8deff6c6ffa3f1e22725a038ec83471f (patch)
tree5531425e497fd10e752a04207c2239e02551c689 /meta
parentdfd6c546c4770350608e9a5313183d18f8119677 (diff)
downloadpoky-189a854e8deff6c6ffa3f1e22725a038ec83471f.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] (From OE-Core rev: 136b13eb6a682222e2af887d3247a61310476c70) 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.inc3
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.15.1.bb13
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 () {
57} 57}
58 58
59DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" 59DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native"
60DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk glib-2.0-nativesdk" 60DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \
61 ${@base_contains('DISTRO_FEATURES', 'x11', 'qemugl-nativesdk', '', d)}"
61RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" 62RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
62EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls" 63EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls"
63 64
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
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6PR = "r2" 6PR = "r3"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${WORKDIR}"
@@ -36,10 +36,17 @@ SRC_URI_append_virtclass-native = "\
36 " 36 "
37 37
38SRC_URI_append_virtclass-nativesdk = "\ 38SRC_URI_append_virtclass-nativesdk = "\
39 ${QEMUGLPATCHES} \ 39 ${@base_contains('DISTRO_FEATURES', 'x11', '${QEMUGLPATCHES} file://glflags.patch', '', d)} \
40 file://glflags.patch \
41 " 40 "
42SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed" 41SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed"
43SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba" 42SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba"
44 43
45S = "${WORKDIR}/qemu-${PV}" 44S = "${WORKDIR}/qemu-${PV}"
45
46do_configure_prepend_virtclass-nativesdk() {
47 if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
48 # Undo the -lX11 added by linker-flags.patch
49 sed -i 's/-lX11//g' Makefile.target
50 fi
51}
52