From: Roman Gilg Date: Mon, 5 Mar 2018 16:41:44 +0000 (+0100) Subject: gallium: work around libtool relink issue for libdrm X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f94597f554d284e8bedf0d00e3ad9e805306548f;p=mesa.git 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 Reviewed-by: Emil Velikov --- diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 73bb71db0c4..c6a4c215905 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 = \