diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu_0.15.1.bb')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_0.15.1.bb | 13 |
1 files changed, 10 insertions, 3 deletions
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 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ |
4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" |
5 | 5 | ||
6 | PR = "r2" | 6 | PR = "r3" |
7 | 7 | ||
8 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" | 8 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" |
9 | FILESDIR = "${WORKDIR}" | 9 | FILESDIR = "${WORKDIR}" |
@@ -36,10 +36,17 @@ SRC_URI_append_virtclass-native = "\ | |||
36 | " | 36 | " |
37 | 37 | ||
38 | SRC_URI_append_virtclass-nativesdk = "\ | 38 | SRC_URI_append_virtclass-nativesdk = "\ |
39 | ${QEMUGLPATCHES} \ | 39 | ${@base_contains('DISTRO_FEATURES', 'x11', '${QEMUGLPATCHES} file://glflags.patch', '', d)} \ |
40 | file://glflags.patch \ | ||
41 | " | 40 | " |
42 | SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed" | 41 | SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed" |
43 | SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba" | 42 | SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba" |
44 | 43 | ||
45 | S = "${WORKDIR}/qemu-${PV}" | 44 | S = "${WORKDIR}/qemu-${PV}" |
45 | |||
46 | do_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 | |||