summaryrefslogtreecommitdiffstats
path: root/meta
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:31:00 +0100
commitd43975861b4fa005e1c26d07f9cfb9569ee59184 (patch)
treeed15e4fb43c2947d7ca1cc574695d369c45646ff /meta
parent01135ee6f2efe08648df020951fb06db49177537 (diff)
downloadpoky-d43975861b4fa005e1c26d07f9cfb9569ee59184.tar.gz
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>
Diffstat (limited to 'meta')
-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 \
33 " 33 "
34 34
35XSERVER_IA32_EXT = " \ 35XSERVER_IA32_EXT = " \
36 xserver-xorg-extension-glx \ 36 ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
37 xserver-xorg-module-libint10 \ 37 xserver-xorg-module-libint10 \
38 " 38 "
39 39
40XSERVER_IA32_I915 = "xf86-video-intel \ 40XSERVER_IA32_I915 = "xf86-video-intel \
41 mesa-driver-i915 \ 41 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \
42 " 42 "
43 43
44XSERVER_IA32_I965 = "xf86-video-intel \ 44XSERVER_IA32_I965 = "xf86-video-intel \
45 mesa-driver-i965 \ 45 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
46 " 46 "
47 47
48XSERVER_IA32_VESA = "xf86-video-vesa" 48XSERVER_IA32_VESA = "xf86-video-vesa"