summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-02-13 08:23:17 +0200
committerSamuli Piippo <samuli.piippo@digia.com>2014-02-13 16:13:16 +0200
commit731303c451c216bd5cb58e939be0d082f2950a90 (patch)
treeab43d1f6a71f7a9f6dda8a832f1c7fc1977fdd86
parentfd4b7ea9473e18060e61cff670f3cabfd074eae9 (diff)
downloadmeta-boot2qt-731303c451c216bd5cb58e939be0d082f2950a90.tar.gz
emulator: don't build mesa with llvm anymore
Change-Id: Id8be2ac9c87748e6365b3f3bdb28833f7d528ede Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
-rw-r--r--conf/distro/include/emulator.conf2
-rw-r--r--recipes/mesa/mesa_9.1.6.bbappend2
2 files changed, 0 insertions, 4 deletions
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index b8a0c57..dee1df3 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,9 +32,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\
32kernel_autoload_snd-intel8x0 = "snd-intel8x0" 32kernel_autoload_snd-intel8x0 = "snd-intel8x0"
33 33
34MACHINE_EXTRA_INSTALL = "\ 34MACHINE_EXTRA_INSTALL = "\
35 llvm3.3 \
36 libegl-mesa \ 35 libegl-mesa \
37 libegl-gallium \
38 libgles2-mesa \ 36 libgles2-mesa \
39 mount-vboxsf \ 37 mount-vboxsf \
40 " 38 "
diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend
index 7f212cf..627f70b 100644
--- a/recipes/mesa/mesa_9.1.6.bbappend
+++ b/recipes/mesa/mesa_9.1.6.bbappend
@@ -21,8 +21,6 @@
21############################################################################# 21#############################################################################
22 22
23EGL_PLATFORMS = "fbdev" 23EGL_PLATFORMS = "fbdev"
24PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl"
25GALLIUMDRIVERS_LLVM = ""
26DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" 24DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915"
27DRIDRIVERS_append += "swrast" 25DRIDRIVERS_append += "swrast"
28EXTRA_OECONF += "--with-dri-drivers=""" 26EXTRA_OECONF += "--with-dri-drivers="""