gallium: work around libtool relink issue for libdrm

This is similar to commit 90633079. libtool links first to system directories
instead of custom locations of libdrm on relinking. Since a more recent libdrm
version than the one provided by the system is often needed when compiling
mesa, make sure this works by putting libdrm in front.

See also: https://bugs.freedesktop.org/show_bug.cgi?id=100259

Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 73bb71db0c4c545a7f5dd80bb4437bb49e9bc553..c6a4c215905e6659441b9ff252cdfc39989461bb 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -52,9 +52,9 @@ gallium_dri_la_LIBADD = \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
        $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
        $(top_builddir)/src/mapi/shared-glapi/libglapi.la \

+       $(LIBDRM_LIBS) \

        $(SELINUX_LIBS) \
        $(EXPAT_LIBS) \
        $(SELINUX_LIBS) \
        $(EXPAT_LIBS) \

-       $(LIBDRM_LIBS) \

        $(GALLIUM_COMMON_LIB_DEPS)
 
 EXTRA_gallium_dri_la_DEPENDENCIES = \
        $(GALLIUM_COMMON_LIB_DEPS)
 
 EXTRA_gallium_dri_la_DEPENDENCIES = \