[OE-core] [PATCH 1/3] ia32-base: only depend on GL if opengl DISTRO_FEATURE enabled

[Darren Hart]

On Wed, 2013-09-11 at 21:30 +0100, Ross Burton wrote:
> 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 at intel.com>
> ---
>  meta/conf/machine/include/ia32-base.inc |    6 +++---
>  1 file 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)} \
>             "

I thought the idea was to try to build with --disable-gl or similar if
the DISTRO_FEATURES didn't include opengl, rather than disable the
driver entirely.

Am I remembering incorrectly, or was there more discussion on that which
showed that couldn't be made to work?

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel