[oe] [meta-oe][PATCH 2/2] mesa, xorg-xserver: include glx-use-tls.inc instead of inheriting glx-use-tls class
Khem Raj
raj.khem at gmail.com
Wed Oct 12 01:57:27 UTC 2011
To match oe-core
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
meta-oe/recipes-graphics/mesa/mesa-common.inc | 3 +--
.../xorg-xserver/xorg-xserver-common.inc | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-graphics/mesa/mesa-common.inc b/meta-oe/recipes-graphics/mesa/mesa-common.inc
index 2e6b599..9b80ecd 100644
--- a/meta-oe/recipes-graphics/mesa/mesa-common.inc
+++ b/meta-oe/recipes-graphics/mesa/mesa-common.inc
@@ -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"
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
index 0b4a854..13bfac7 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
+++ b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
@@ -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 \
--
1.7.5.4
More information about the Openembedded-devel
mailing list