summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch40
1 files changed, 29 insertions, 11 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch
index 0ad5551..638d262 100644
--- a/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch
@@ -1,15 +1,33 @@
+Considering relocation, qemu-nativesdk is independent of host library except
+libGL. Normal method like 'cat > $TMPC' doesn't work, so we check the library
+directly.
+
Upstream-Status: Inappropriate [configuration]
-Index: qemu-0.14.0/Makefile.target
+Index: qemu-0.15.1/configure
===================================================================
---- qemu-0.14.0.orig/Makefile.target 2011-04-04 12:12:19.142871742 +0100
-+++ qemu-0.14.0/Makefile.target 2011-04-04 12:12:21.772871742 +0100
-@@ -362,7 +362,7 @@
-
- monitor.o: hmp-commands.h qmp-commands.h
-
--LIBS += -lGL -lGLU
-+LIBS += -lGL
-
- $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
+--- qemu-0.15.1.orig/configure 2012-05-25 18:26:05.000000000 +0800
++++ qemu-0.15.1/configure 2012-05-29 09:43:27.000000000 +0800
+@@ -2032,15 +2032,13 @@
+ exit 1;
+ fi
+- gl_accel_libs="-lGL -lGLU"
+- cat > $TMPC << EOF
+-#include <X11/Xlib.h>
+-#include <GL/gl.h>
+-#include <GL/glx.h>
+-#include <GL/glu.h>
+-int main(void) { GL_VERSION; return 0; }
+-EOF
+- if compile_prog "" "-lGL -lGLU" ; then
++ gl_accel_libs="-lGL"
++ libgl='no'
++ test -e /usr/lib/libGL.so && libgl='yes'
++ test -e /usr/lib64/libGL.so && libgl='yes'
++ test -e /usr/lib/*-linux-gnu/libGL.so && libgl='yes'
++
++ if test "$libgl" = "yes" ; then
+ gl_accel=yes
+ libs_softmmu="$gl_accel_libs $libs_softmmu"
+ else
OpenPOWER on IntegriCloud