Skip to contentSkip to conversation

classes/glx-use-tls.bbclass: Delete

PATCH In review Khem Raj 2 participants 4 messages Oct 12, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 classes/glx-use-tls.bbclass: Delete

This functionality is now available in oe-core

---
 meta-oe/classes/glx-use-tls.bbclass |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
 delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
meta-oe/classes/glx-use-tls.bbclass deleted +0 -7
deleted file mode 100644
index 7530872..0000000
@@ -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)}"
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 mesa, xorg-xserver: include glx-use-tls.inc instead of inheriting glx-use-tls class

To match oe-core

---
 meta-oe/recipes-graphics/mesa/mesa-common.inc      |    3 +--
 .../xorg-xserver/xorg-xserver-common.inc           |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-graphics/mesa/mesa-common.inc +1 -2
index 2e6b599..9b80ecd 100644
@@ -25,8 +25,7 @@ EXTRA_OECONF = "--enable-glu \
                 --disable-glw \
                 --disable-glut \
 	       "
-
-inherit glx-use-tls
+include recipes-graphics/mesa/glx-use-tls.inc
 
 PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc +2 -2
index 0b4a854..13bfac7 100644
@@ -36,8 +36,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig glx-use-tls
-
+inherit autotools pkgconfig
+include recipes-graphics/mesa/glx-use-tls.inc
 EXTRA_OECONF += " --enable-xcalibrate \
                   --enable-kdrive \
                   --enable-xephyr \
Signature · 1 line
1.7.5.4
#2 lore raw

Re: [meta-oe][PATCH 2/2] mesa, xorg-xserver: include glx-use-tls.inc instead of inheriting glx-use-tls class

Quoted 1 line · Khem Raj

To match oe-core

Both should be removed completely
http://patches.openembedded.org/patch/12633/
http://patches.openembedded.org/patch/12627/

but needs the rest of Xorg patchset in oe-core
http://patches.openembedded.org/patch/12933/

Quoted 44 lines
---
 meta-oe/recipes-graphics/mesa/mesa-common.inc      |    3 +--
 .../xorg-xserver/xorg-xserver-common.inc           |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-graphics/mesa/mesa-common.inc +1 -2
index 2e6b599..9b80ecd 100644
@@ -25,8 +25,7 @@ EXTRA_OECONF = "--enable-glu \
                 --disable-glw \
                 --disable-glut \
 	       "
-
-inherit glx-use-tls
+include recipes-graphics/mesa/glx-use-tls.inc
 
 PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc +2 -2
index 0b4a854..13bfac7 100644
@@ -36,8 +36,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig glx-use-tls
-
+inherit autotools pkgconfig
+include recipes-graphics/mesa/glx-use-tls.inc
 EXTRA_OECONF += " --enable-xcalibrate \
                   --enable-kdrive \
                   --enable-xephyr \
Signature · 7 lines
1.7.5.4


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
In reply to Khem Raj
Quoted 1 line · Khem Raj

This functionality is now available in oe-core

There was
http://patches.openembedded.org/patch/12643/
in my last pull request..

Quoted 28 lines
---
 meta-oe/classes/glx-use-tls.bbclass |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
 delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
meta-oe/classes/glx-use-tls.bbclass deleted +0 -7
deleted file mode 100644
index 7530872..0000000
@@ -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)}"
Signature · 7 lines
1.7.5.4


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]