From: Ross Burton Date: Wed, 11 Sep 2013 20:30:25 +0000 (+0100) Subject: ia32-base: only depend on GL if opengl DISTRO_FEATURE enabled X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~36041 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5c07e6c3b492f56ce9c5f99a732793403d6b36;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc index cb542a5e958..e58a31478df 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"