[Mesa-dev] [PATCH v2 29/40] {st, targets}/dri: use static/dynamic pipe-loader

[Jon Turney]

On 20/11/2015 20:11, Emil Velikov wrote:
> Covert DRI to use only the pipe-loader interface.
>
> With drisw_create_screen and kms_swrast_create_screen replaced by their
> pipe-loader equivalent, we can now drop them.
>
[...]
> --- a/src/gallium/targets/dri/Makefile.am
> +++ b/src/gallium/targets/dri/Makefile.am
> @@ -64,7 +64,7 @@ EXTRA_DIST = \
>
>   TARGET_DRIVERS =
>   TARGET_CPPFLAGS =
> -TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
> +TARGET_LIB_DEPS =
>
>   include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc

This change causes building gallium_dri.so to fail for me when building 
for Cygwin, due to unresolved symbols from libxmlconfig, which were 
being included via libloader. (See [1] for build log)

Perhaps something like the attached is needed?

[1] 
http://ec2-52-16-27-13.eu-west-1.compute.amazonaws.com:8010/builders/mesa-mesa/builds/643

-------------- next part --------------
From 4d92c73daa08abe0a10a5b73565f3a42805090a9 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney at dronecode.org.uk>
Date: Sat, 21 Nov 2015 16:32:26 +0000
Subject: [PATCH] Fix Cygwin build since 23fb1145 by linking gallium_dri with
 libxmlconfig

---
 src/gallium/targets/dri/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 5d0fe47..1b2da63 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST = \
 
 TARGET_DRIVERS =
 TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
+TARGET_LIB_DEPS = $(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
 
 include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
 
-- 
2.5.3