From: Topi Pohjolainen Date: Thu, 23 Mar 2017 12:27:40 +0000 (+0000) Subject: glx: Prefer library path given by pkgconfig over the system X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90633079eccdc7b883b712695c057553d484405f;p=mesa.git glx: Prefer library path given by pkgconfig over the system Recent change to use drmGetDevices2() made me realize that build configured using PKG_CONFIG_PATH=my_drm_lib_path/pkgconfig ./autogen.sh considers the libdrm path gotten from pkgconfig only during make. When invoking "make install" the relink command puts system library ahead of the path gotten from pkgconfig (and starts to fail as system libdrm isn't new enough). This change forces the relink command to respect pkgconfig settings. It looks to me that in https://bugs.freedesktop.org/show_bug.cgi?id=100259 with Emil et al considering it a libtool bug. Signed-off-by: Topi Pohjolainen [Emil Velikov: add inline comment] Signed-off-by: Emil Velikov --- diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 79d416abcad..5c0376408cc 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -174,7 +174,10 @@ AM_CFLAGS += \ GL_LIB_VERSION=1:2 endif +# Push the libdrm furhter up, as due to libtool bug we might end up relinking +# against the system one. GL_LIBS = \ + $(LIBDRM_LIBS) \ libglx.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ $(SHARED_GLAPI_LIB) \