[Mesa-dev] [v2] glx: Prefer library path given by pkgconfig over the system

[Pohjolainen, Topi]

On Tue, Mar 21, 2017 at 10:33:12AM +0000, Emil Velikov wrote:
> On 21 March 2017 at 09:09, Topi Pohjolainen <topi.pohjolainen at gmail.com> wrote:
> > 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
> >
> > Emil et al are discussing similar case with gbm.
> >
> > v2: Reorder existing libarary/dependency lists instead of
> >     introducing duplicates (GL_LIB_DEPS contains DRI_LIB_DEPS).
> >
> > CC: Matt Turner <mattst88 at gmail.com>
> > CC: Emil Velikov <emil.velikov at collabora.com>
> > Tested-by: Grazvydas Ignotas <notasas at gmail.com> (v1)
> > Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> > ---
> >  src/glx/Makefile.am | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
> > index 79d416a..98c4018 100644
> > --- a/src/glx/Makefile.am
> > +++ b/src/glx/Makefile.am
> > @@ -175,10 +175,10 @@ GL_LIB_VERSION=1:2
> >  endif
> >
> >  GL_LIBS = \
> > +       $(GL_LIB_DEPS) \
> Are you sure this works correctly - afaict it can cause link issues
> since the dependee must be before the dependency in the link chain.
> Either way It still needs a inline comment - just copy small hunk of
> the commit message.

I see you decided to push the original (v1).