[oe-commits] Martin Jansa : xserver-xorg: remove glx-use-tls again

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 629bea96ae07d9f3129a5da488682851a4e09d52
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=629bea96ae07d9f3129a5da488682851a4e09d52

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Oct 15 12:24:19 2011 +0200

xserver-xorg: remove glx-use-tls again

* khem confirmed that uclibc does support it now

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

---

 meta/recipes-graphics/mesa/glx-use-tls.inc         |    7 -------
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    3 +--
 2 files changed, 1 insertions(+), 9 deletions(-)

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 7530872..0000000
--- 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 01cdd68..9246b06 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 \
 "