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>
This commit is contained in:
parent
5d92f334dc
commit
5f37ef4681
|
@ -0,0 +1,41 @@
|
|||
diff -u -r qemu-0.14.0/Makefile.target qemu-0.14.0-fixed/Makefile.target
|
||||
--- qemu-0.14.0/Makefile.target 2011-04-26 21:22:17.627637741 -0700
|
||||
+++ qemu-0.14.0-fixed/Makefile.target 2011-04-26 21:23:02.767637747 -0700
|
||||
@@ -82,8 +82,10 @@
|
||||
libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
|
||||
libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
|
||||
else
|
||||
+ifdef CONFIG_SDL
|
||||
libobj-$(TARGET_I386) += dummygl.o
|
||||
libobj-$(TARGET_X86_64) += dummygl.o
|
||||
+endif
|
||||
endif #CONFIG_LINUX_USER
|
||||
libobj-$(TARGET_ARM) += dummygl.o
|
||||
libobj-$(TARGET_MIPS) += dummygl.o
|
||||
Only in qemu-0.14.0-fixed: config.log
|
||||
diff -u -r qemu-0.14.0/target-i386/helper.h qemu-0.14.0-fixed/target-i386/helper.h
|
||||
--- qemu-0.14.0/target-i386/helper.h 2011-04-26 21:22:11.418637742 -0700
|
||||
+++ qemu-0.14.0-fixed/target-i386/helper.h 2011-04-26 21:23:02.539637747 -0700
|
||||
@@ -217,6 +217,9 @@
|
||||
DEF_HELPER_2(rcrq, tl, tl, tl)
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_SDL
|
||||
DEF_HELPER_0(opengl, void)
|
||||
+#endif
|
||||
+
|
||||
|
||||
#include "def-helper.h"
|
||||
diff -u -r qemu-0.14.0/target-i386/translate.c qemu-0.14.0-fixed/target-i386/translate.c
|
||||
--- qemu-0.14.0/target-i386/translate.c 2011-04-26 21:22:21.600637743 -0700
|
||||
+++ qemu-0.14.0-fixed/target-i386/translate.c 2011-04-26 21:23:02.538637747 -0700
|
||||
@@ -2659,7 +2659,7 @@
|
||||
static void gen_interrupt(DisasContext *s, int intno,
|
||||
target_ulong cur_eip, target_ulong next_eip)
|
||||
{
|
||||
-#if !defined(CONFIG_USER_ONLY)
|
||||
+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_SDL)
|
||||
if (enable_gl && intno == 0x99) {
|
||||
gen_helper_opengl();
|
||||
return;
|
||||
|
|
@ -16,6 +16,8 @@ EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --di
|
|||
|
||||
#EXTRA_OECONF += "--disable-sdl"
|
||||
|
||||
COMPATIBLE_MACHINES = "qemux86 qemuppc"
|
||||
|
||||
inherit autotools
|
||||
|
||||
# For our gl powered QEMU you need libGL and SDL headers
|
||||
|
|
|
@ -3,7 +3,7 @@ require qemu.inc
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
|
||||
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
|
||||
FILESDIR = "${WORKDIR}"
|
||||
|
@ -25,6 +25,7 @@ SRC_URI = "\
|
|||
file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \
|
||||
file://larger_default_ram_size.patch \
|
||||
file://qemugl-fix.patch \
|
||||
file://opengl-sdl-fix.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970"
|
||||
SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"
|
||||
|
|
Loading…
Reference in New Issue