From 8b5c07e6c3b492f56ce9c5f99a732793403d6b36 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 11 Sep 2013 21:30:25 +0100 Subject: 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32-base.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc index cb542a5e95..e58a31478d 100644 --- 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" -- cgit 1.2.3-korg