From: Roy Li Date: Thu, 18 Jun 2015 09:18:57 +0000 (+0800) Subject: piglit: fix floating dependence on freeglut X-Git-Tag: 2015-10~1457 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=71158fa1a623125;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 9e6dc2c406..3a8b0acfa2 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 $/d" ${S}/src/piglit/glut_wrap.h + fi +} + FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/" RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \