[Mesa-dev] [PATCH] gallium/targets: resolve undefined reference to

[Emil Velikov]

On 24/02/14 14:26, Emil Velikov wrote:
> With the introduction of the pipe_loader_sw_probe_dri helper we
> require the sw/dri winsys during linking stage despite it being
> unused by any of the targets. This will cause a minor increase
> in the resulting library which will be cleaned up via linker
> options with upcoming patches.
> 
> Cc: Tom Stellard <thomas.stellard at amd.com>
> Reported-by: Tom Stellard <thomas.stellard at amd.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
> 
> This should cover the final breakages caused by the recent
> pipe-loader changes.
> 
> -Emil 
> 
>  src/gallium/targets/gbm/Makefile.am    | 1 +
>  src/gallium/targets/opencl/Makefile.am | 1 +
>  src/gallium/targets/xa/Makefile.am     | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
> index ecbb9ad..63195fa 100644
> --- a/src/gallium/targets/gbm/Makefile.am
> +++ b/src/gallium/targets/gbm/Makefile.am
> @@ -44,6 +44,7 @@ gbm_gallium_drm_la_SOURCES = gbm.c
>  gbm_gallium_drm_la_LIBADD = \
>  	$(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
>  	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
> +	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
Sigh seems like I would need to wrap all the occurrences in

if HAVE_DRI
endif

-Emil
>  	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
>  	$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
> diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
> index e82889e..1c84411 100644
> --- a/src/gallium/targets/opencl/Makefile.am
> +++ b/src/gallium/targets/opencl/Makefile.am
> @@ -8,6 +8,7 @@ lib at OPENCL_LIBNAME@_la_LDFLAGS = \
>  
>  lib at OPENCL_LIBNAME@_la_LIBADD = \
>  	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
> +	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
>  	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
>  	$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
> diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
> index 7ab57ff..245dfff 100644
> --- a/src/gallium/targets/xa/Makefile.am
> +++ b/src/gallium/targets/xa/Makefile.am
> @@ -42,6 +42,7 @@ libxatracker_la_SOURCES =
>  libxatracker_la_LIBADD = \
>  	$(GALLIUM_PIPE_LOADER_LIBS) \
>  	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
> +	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
>  	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
>  	$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
>