summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-04-26 21:43:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 10:45:50 +0100
commit5f37ef46813c20c7caaaf4a29a018f60fffb9ac8 (patch)
tree0e9f2516abff34feaa46d64d5180b8d3d86f412a
parent5d92f334dca8fed423c49bc5564bedfdbe9e6fa1 (diff)
downloadpoky-5f37ef46813c20c7caaaf4a29a018f60fffb9ac8.tar.gz
qemu: Fix non-sdl/opengl build
(From OE-Core rev: 4b3e39a9dd491a8a6996fce8ed0d05074ea920f5) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch41
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.14.0.bb3
3 files changed, 45 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch
new file mode 100644
index 0000000000..1f34f07757
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch
@@ -0,0 +1,41 @@
1diff -u -r qemu-0.14.0/Makefile.target qemu-0.14.0-fixed/Makefile.target
2--- qemu-0.14.0/Makefile.target 2011-04-26 21:22:17.627637741 -0700
3+++ qemu-0.14.0-fixed/Makefile.target 2011-04-26 21:23:02.767637747 -0700
4@@ -82,8 +82,10 @@
5 libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
6 libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
7 else
8+ifdef CONFIG_SDL
9 libobj-$(TARGET_I386) += dummygl.o
10 libobj-$(TARGET_X86_64) += dummygl.o
11+endif
12 endif #CONFIG_LINUX_USER
13 libobj-$(TARGET_ARM) += dummygl.o
14 libobj-$(TARGET_MIPS) += dummygl.o
15Only in qemu-0.14.0-fixed: config.log
16diff -u -r qemu-0.14.0/target-i386/helper.h qemu-0.14.0-fixed/target-i386/helper.h
17--- qemu-0.14.0/target-i386/helper.h 2011-04-26 21:22:11.418637742 -0700
18+++ qemu-0.14.0-fixed/target-i386/helper.h 2011-04-26 21:23:02.539637747 -0700
19@@ -217,6 +217,9 @@
20 DEF_HELPER_2(rcrq, tl, tl, tl)
21 #endif
22
23+#ifdef CONFIG_SDL
24 DEF_HELPER_0(opengl, void)
25+#endif
26+
27
28 #include "def-helper.h"
29diff -u -r qemu-0.14.0/target-i386/translate.c qemu-0.14.0-fixed/target-i386/translate.c
30--- qemu-0.14.0/target-i386/translate.c 2011-04-26 21:22:21.600637743 -0700
31+++ qemu-0.14.0-fixed/target-i386/translate.c 2011-04-26 21:23:02.538637747 -0700
32@@ -2659,7 +2659,7 @@
33 static void gen_interrupt(DisasContext *s, int intno,
34 target_ulong cur_eip, target_ulong next_eip)
35 {
36-#if !defined(CONFIG_USER_ONLY)
37+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_SDL)
38 if (enable_gl && intno == 0x99) {
39 gen_helper_opengl();
40 return;
41
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 362e9f35e5..49bcf8e939 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -16,6 +16,8 @@ EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --di
16 16
17#EXTRA_OECONF += "--disable-sdl" 17#EXTRA_OECONF += "--disable-sdl"
18 18
19COMPATIBLE_MACHINES = "qemux86 qemuppc"
20
19inherit autotools 21inherit autotools
20 22
21# For our gl powered QEMU you need libGL and SDL headers 23# For our gl powered QEMU you need libGL and SDL headers
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
index e440759d36..f0a4beae1c 100644
--- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.14.0.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 = "r0" 6PR = "r1"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${WORKDIR}"
@@ -25,6 +25,7 @@ SRC_URI = "\
25 file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ 25 file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \
26 file://larger_default_ram_size.patch \ 26 file://larger_default_ram_size.patch \
27 file://qemugl-fix.patch \ 27 file://qemugl-fix.patch \
28 file://opengl-sdl-fix.patch \
28 " 29 "
29SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970" 30SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970"
30SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108" 31SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"