[oe-commits] Roy Li : piglit: fix floating dependence on freeglut

[git at git.openembedded.org]

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

Author: Roy Li <rongqing.li at windriver.com>
Date:   Thu Jun 18 17:18:57 2015 +0800

piglit: fix floating dependence on freeglut

cmake can not handle "ifdef" and make floating dependence on freeglut_ext.h
when make_depend, so remove to include freeglut_ext.h from header file if
freegult is not in PACKAGECONFIG to fix this issue

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-graphics/piglit/piglit_git.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 9e6dc2c..3a8b0ac 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -21,6 +21,12 @@ REQUIRED_DISTRO_FEATURES = "x11"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
 
+do_configure_prepend() {
+   if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
+        sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h
+   fi
+}
+
 FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
 
 RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \