[OE-core] [PATCH] piglit: fix floating dependence on freeglut

rongqing.li at windriver.com rongqing.li at windriver.com
Thu Jun 18 09:18:57 UTC 2015


From: Roy Li <rongqing.li at windriver.com>

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>
---
 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 75e41fe..840fe3d 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -20,6 +20,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 \
-- 
1.9.1




More information about the Openembedded-core mailing list