From dfe2bb428bb6db6938859927a8004caa167b96a8 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 13 Jul 2009 15:07:18 -0400 Subject: mesa-dri: move tls configure logic to a class Will allow reuse by xorg-xserver. Signed-off-by: Michael Smith --- classes/glx-use-tls.bbclass | 7 +++++++ recipes/mesa/mesa-common.inc | 3 +-- recipes/mesa/mesa-tls.inc | 6 ------ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 classes/glx-use-tls.bbclass delete mode 100644 recipes/mesa/mesa-tls.inc diff --git a/classes/glx-use-tls.bbclass b/classes/glx-use-tls.bbclass new file mode 100644 index 0000000000..7530872fa4 --- /dev/null +++ b/classes/glx-use-tls.bbclass @@ -0,0 +1,7 @@ +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/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index 4f18c2f710..d7bfc148c5 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -19,8 +19,7 @@ EXTRA_OECONF = "--enable-glu \ --disable-glut \ " -require mesa-tls.inc -EXTRA_OECONF += "${@get_tls_setting(bb, d)} " +inherit glx-use-tls # Package contents vary according to ${MACHINE_DRI_MODULES}. PACKAGE_ARCH = "${MACHINE}" diff --git a/recipes/mesa/mesa-tls.inc b/recipes/mesa/mesa-tls.inc deleted file mode 100644 index 1472aa7e74..0000000000 --- a/recipes/mesa/mesa-tls.inc +++ /dev/null @@ -1,6 +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" -- cgit v1.2.3