diff options
| author | Topi Pohjolainen <[email protected]> | 2017-03-23 12:27:40 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-23 12:30:19 +0000 |
| commit | 90633079eccdc7b883b712695c057553d484405f (patch) | |
| tree | fd7e78800c6c21b03d325b9c463e8f7dea7c0017 /src | |
| parent | 4f69573178dabe53e0f761b3f1e512658d71af98 (diff) | |
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 <[email protected]>
[Emil Velikov: add inline comment]
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
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) \ |