summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-10-15 12:24:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-17 14:10:39 +0100
commit9448de61c0f6fc8dfadcbfa069904a5e79ae81b0 (patch)
tree1e4ba1e330d1e080f772ea760febb91a54d40543 /meta/recipes-graphics
parent2fd6598a2ced86a54e82062e9e2a547544360e32 (diff)
downloadpoky-9448de61c0f6fc8dfadcbfa069904a5e79ae81b0.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/glx-use-tls.inc7
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc3
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 7530872fa4..0000000000
--- a/meta/recipes-graphics/mesa/glx-use-tls.inc
+++ /dev/null
@@ -1,7 +0,0 @@
1def get_tls_setting(bb, d):
2 # until we have no prober TLS support in uclibc disable it
3 if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
4 return ""
5 return "--enable-glx-tls"
6
7EXTRA_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 01cdd681f6..9246b06ccc 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
3PROTO_DEPS += "xf86driproto dri2proto" 3PROTO_DEPS += "xf86driproto dri2proto"
4LIB_DEPS += "virtual/libgl" 4LIB_DEPS += "virtual/libgl"
5 5
6require ../mesa/glx-use-tls.inc
7
8EXTRA_OECONF += "\ 6EXTRA_OECONF += "\
9 --enable-dri \ 7 --enable-dri \
10 --enable-dri2 \ 8 --enable-dri2 \
9 --enable-glx-tls \
11 --with-pic \ 10 --with-pic \
12 --with-int10=x86emu \ 11 --with-int10=x86emu \
13" 12"