diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-09-11 21:30:25 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 23:31:00 +0100 |
| commit | d43975861b4fa005e1c26d07f9cfb9569ee59184 (patch) | |
| tree | ed15e4fb43c2947d7ca1cc574695d369c45646ff /meta/conf/machine/include | |
| parent | 01135ee6f2efe08648df020951fb06db49177537 (diff) | |
| download | ast2050-yocto-poky-d43975861b4fa005e1c26d07f9cfb9569ee59184.zip ast2050-yocto-poky-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/conf/machine/include')
| -rw-r--r-- | meta/conf/machine/include/ia32-base.inc | 6 |
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 cb542a5..e58a314 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" |
