summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-07-14 15:08:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:20 +0100
commite47a97a2f6e9b2ba8100cd4b2b7390f4a05ee345 (patch)
treeadb34a41e50e8473f71770343824e92f603fd792
parentfdbd3227b3d92d5f94a82aa44eec8be22026a903 (diff)
downloadpoky-e47a97a2f6e9b2ba8100cd4b2b7390f4a05ee345.tar.gz
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 (From OE-Core rev: e53d09e265a217928e1436208e0f9057aa8ef7ae) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 3a8b0acfa2..0d825c9818 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,"
24do_configure_prepend() { 24do_configure_prepend() {
25 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then 25 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
26 sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h 26 sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h
27 sed -i -e "/^#.*include.*<GL\/glut.h>$/d" ${S}/src/piglit/glut_wrap.h
27 fi 28 fi
28} 29}
29 30