ia32-base: only depend on GL if opengl DISTRO_FEATURE enabled

As Mesa refuses to compile if the "opengl" DISTRO_FEATURE isn't enabled,
mesa-driver-i9xx and the GLX X module have to be conditional in the ia32 machine
defintion too.

(From OE-Core rev: 8b5c07e6c3b492f56ce9c5f99a732793403d6b36)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index cb542a5..e58a314 100644 (file)
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -33,16 +33,16 @@ XSERVER_IA32_BASE = "xserver-xorg \
            "
 
 XSERVER_IA32_EXT = " \
-           xserver-xorg-extension-glx \
+           ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
            xserver-xorg-module-libint10 \
            "
 
 XSERVER_IA32_I915 = "xf86-video-intel \
-           mesa-driver-i915 \
+           ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \
            "
 
 XSERVER_IA32_I965 = "xf86-video-intel \
-           mesa-driver-i965 \
+           ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"