From 3905be16940ea642244935517f121a84e28aac0f Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 6 May 2015 02:17:08 -0700 Subject: 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. Signed-off-by: Robert Yang --- meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb index 1caa50bc1b..e565442fc6 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb @@ -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)}" -- cgit 1.2.3-korg