[Mesa-dev] [PATCH] egl: guard wayland header dep. tracking behind HAVE_PLATFORM_WAYLAND

Tapani Pälli tapani.palli at intel.com
Mon Jul 24 12:42:51 UTC 2017


Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 07/24/2017 03:27 PM, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Otherwise we'll attemt to generate the header even we don't need to.
> In that case the dependencies may not be met, leading to build failure.
> 
> Cc: Tapani Pälli <tapani.palli at intel.com>
> Fixes: 166852e "configure.ac: rework wayland-protocols handling"
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>   src/egl/Makefile.am | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
> index f881145c0e3..ecaf148aaec 100644
> --- a/src/egl/Makefile.am
> +++ b/src/egl/Makefile.am
> @@ -74,10 +74,10 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
>   	$(MKDIR_GEN)
>   	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
>   
> +if HAVE_PLATFORM_WAYLAND
>   drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
>   drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
>   
> -if HAVE_PLATFORM_WAYLAND
>   AM_CFLAGS += $(WAYLAND_CFLAGS)
>   libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
>   libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
> 


More information about the mesa-dev mailing list