summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-11 21:30:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 23:21:49 +0100
commit8b5c07e6c3b492f56ce9c5f99a732793403d6b36 (patch)
treea4a9289f49d273fb90024662e6c9e87a1eb2ed1f /meta/conf
parent9e4e475b598f6b9bd2b653c72a1c1d5bd5c0b8c9 (diff)
downloadopenembedded-core-8b5c07e6c3b492f56ce9c5f99a732793403d6b36.tar.gz
openembedded-core-8b5c07e6c3b492f56ce9c5f99a732793403d6b36.tar.bz2
openembedded-core-8b5c07e6c3b492f56ce9c5f99a732793403d6b36.zip
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/ia32-base.inc6
1 files changed, 3 insertions, 3 deletions
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"