[oe-commits] Roy Li : piglit: Fix floating dependency on freeglut

git at git.openembedded.org git at git.openembedded.org
Mon Jul 20 09:42:04 UTC 2015


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

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Jul 14 15:08:25 2015 +0800

piglit: Fix floating dependency on freeglut

71158fa1a623125[fix floating dependence on freeglut] is incomplete,
so continue by removing glut.h header file when not enable freeglut

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

---

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

diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 3a8b0ac..0d825c9 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -24,6 +24,7 @@ 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
+        sed -i -e "/^#.*include.*<GL\/glut.h>$/d" ${S}/src/piglit/glut_wrap.h
    fi
 }
 



More information about the Openembedded-commits mailing list