mesa-demos: only enable glu when x11 in DISTRO_FEATURES

Fixed when no x11 in DISTRO_FEATURES:
checking for GL/glu.h... no
configure: error: GLU not found

The GL/glu.h is provided by libglu, and libglu requires libGL.so which
is provided by mesa, but mesa doesn't build out libGL.so without x11 in
DISTRO_FEATURES, so only enable glu when x11 in DISTRO_FEATURES.

(From OE-Core rev: 3905be16940ea642244935517f121a84e28aac0f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2015-05-06 02:17:08 -07:00
committed by Richard Purdie
parent d5f7e09a89
commit 5f21aa0776

View File

@@ -25,8 +25,8 @@ SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f
inherit autotools pkgconfig
PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 glu \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew', '', d)}"
PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu', '', d)}"
# The Wayland code doesn't work with Wayland 1.0, so disable it for now
#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"