Mesa (master): gallium: work around libtool relink issue for libdrm

[Emil Velikov]

Module: Mesa
Branch: master
Commit: f94597f554d284e8bedf0d00e3ad9e805306548f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f94597f554d284e8bedf0d00e3ad9e805306548f

Author: Roman Gilg <subdiff at gmail.com>
Date:   Mon Mar  5 17:41:44 2018 +0100

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 at gmail.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 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 73bb71db0c..c6a4c21590 100644
--- 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 \
+	$(LIBDRM_LIBS) \
 	$(SELINUX_LIBS) \
 	$(EXPAT_LIBS) \
-	$(LIBDRM_LIBS) \
 	$(GALLIUM_COMMON_LIB_DEPS)
 
 EXTRA_gallium_dri_la_DEPENDENCIES = \