From 4420431e43c6affcb02fad33532d42f1e1d06173 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 20 Jul 2015 20:50:36 -0300 Subject: mesa: Fix override of x11 GLX support for i.MX6 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 --- recipes-graphics/mesa/mesa_%.bbappend | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'recipes-graphics') diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 5030e7a3..f8cf1bce 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -18,6 +18,17 @@ USE_VIV_LIBGL_mx6q = "yes" USE_VIV_LIBGL_mx6dl = "yes" USE_VIV_LIBGL_mx6sx = "yes" +# 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 @@ -26,4 +37,3 @@ do_install_append_mx6 () { ${D}${includedir}/GL/glext.h fi } -EXTRA_OECONF_mx6 := "${@'${EXTRA_OECONF}'.replace('--enable-glx-tls','--enable-glx')}" -- cgit v1.2.3-54-g00ecf