summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-05 14:08:37 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-05 14:08:37 +0000
commit851267d2af857aa8211f7b7451fd4d2c41cc6f3a (patch)
treea730d1a00dbf141a65ede7932ee263d57f3d7058
parent173f02f3e8305af22fbeb321108d72ac077b8348 (diff)
downloadopenembedded-core-851267d2af857aa8211f7b7451fd4d2c41cc6f3a.tar.gz
openembedded-core-851267d2af857aa8211f7b7451fd4d2c41cc6f3a.tar.bz2
openembedded-core-851267d2af857aa8211f7b7451fd4d2c41cc6f3a.tar.xz
openembedded-core-851267d2af857aa8211f7b7451fd4d2c41cc6f3a.zip
mesa-dri-git: Handle cross compiling of the glsl utils
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/mesa/mesa-dri_git.bb12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index 867bdce0b..35cb7fa6f 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -11,8 +11,8 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-PV = "7.5+git${SRCPV}"
-PR = "r14"
+PV = "7.7+git${SRCPV}"
+PR = "r0"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
@@ -35,6 +35,14 @@ do_configure_prepend () {
touch ${S}/src/mesa/x86/matypes.h
}
+do_compile () {
+ oe_runmake clean
+ oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS=""
+ mv ${S}/src/glsl/apps/compile ${S}/host_compile
+ oe_runmake clean
+ oe_runmake GLSL_CL="${S}/host_compile"
+}
+
do_install_append () {
install -d ${D}/usr/bin
install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/