[meta-freescale] [meta-fsl-arm][PATCH 6/7] mesa: Fix override of x11 GLX support for i.MX6

[Otavio Salvador]

The replacement of --enable-glx-tls for --enable-glx was not working
due the way the variables are expanded. To fix the issue an annonymous
function has been added to mangle it just before its use.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
 recipes-graphics/mesa/mesa_%.bbappend | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index bfec001..9bebb92 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -13,6 +13,17 @@ PROVIDES_remove_mx6sx = "virtual/libgl"
 USE_VIV_LIBGL = "yes"
 USE_VIV_LIBGL_mx6sl = "no"
 
+# FIXME: mesa should support 'x11-no-tls' option
+python () {
+    overrides = d.getVar("OVERRIDES", True).split(":")
+    if "mx6" not in overrides:
+        return
+
+    extra_oeconf = d.getVar("EXTRA_OECONF", True)
+    extra_oeconf = extra_oeconf.replace("--enable-glx-tls", "--enable-glx")
+    d.setVar("EXTRA_OECONF", extra_oeconf)
+}
+
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
 do_install_append_mx6 () {
     if [ "${USE_VIV_LIBGL}" = "yes" ]; then
@@ -21,4 +32,3 @@ do_install_append_mx6 () {
               ${D}${includedir}/GL/glext.h
     fi
 }
-EXTRA_OECONF_mx6 := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}"
-- 
2.4.6