From: Martin Jansa <martin.jansa@gmail.com>
Date: Sat, 15 Oct 2011 10:24:19 +0000 (+0200)
Subject: xserver-xorg: remove glx-use-tls again
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9448de61c0f6fc8dfadcbfa069904a5e79ae81b0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

xserver-xorg: remove glx-use-tls again

* khem confirmed that uclibc does support it now

(From OE-Core rev: 629bea96ae07d9f3129a5da488682851a4e09d52)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/mesa/glx-use-tls.inc b/meta/recipes-graphics/mesa/glx-use-tls.inc
deleted file mode 100644
index 7530872fa42..00000000000
--- a/meta/recipes-graphics/mesa/glx-use-tls.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-def get_tls_setting(bb, d):
-    # until we have no prober TLS support in uclibc disable it
-    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
-        return ""
-    return "--enable-glx-tls"
-
-EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 01cdd681f62..9246b06cccb 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,11 +3,10 @@ require xserver-xorg-common.inc
 PROTO_DEPS += "xf86driproto dri2proto"
 LIB_DEPS += "virtual/libgl"
 
-require ../mesa/glx-use-tls.inc
-
 EXTRA_OECONF += "\
                  --enable-dri \
                  --enable-dri2 \
+                 --enable-glx-tls \
                  --with-pic \
                  --with-int10=x86emu \
 "