[Mesa-dev] [PATCH] mapi: fix out-of-tree build dependencies

[Eric Engestrom]

On Tue, Oct 11, 2016 at 03:26:04PM +0100, Emil Velikov wrote:
> On 11 October 2016 at 14:46, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> > From: Nicolai Hähnle <nicolai.haehnle at amd.com>
> >
> > Pick up changes to API XML files also when Mesa is built outside the source
> > tree.
> > ---
> >  src/mapi/Makefile.am | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
> > index d6bf5d8..46afe3b 100644
> > --- a/src/mapi/Makefile.am
> > +++ b/src/mapi/Makefile.am
> > @@ -49,22 +49,22 @@ AM_CPPFLAGS =                                                       \
> >         -I$(top_srcdir)/src/mapi                                \
> >         -I$(top_builddir)/src/mapi
> >
> >  include Makefile.sources
> >
> >  MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> >  PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> >
> >  glapi_gen_mapi_deps := \
> >         mapi_abi.py \
> > -       $(wildcard glapi/gen/*.xml) \
> > -       $(wildcard glapi/gen/*.py)
> > +       $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
> > +       $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
> >
> Hmm are you sure about this ? AFAICT by default you get $srcdir which
> combined with glapi/gen/foo should work just fine... or is it the
> wildcard that's causing the mayhem ? Please add a word or two about it
> in the commit message.

Nicolai, I just tested locally, changes to the xml files are picked up
just fine without this patch. Do you maybe have some old in-tree-build
files lying around? Try `git clean -dxfn` (remove `-n` once you're sure
you won't delete any file you want to keep) and try again?

> 
> In the long run we _really_ want to drop our dispatch and use the
> GLVND one. The GLVND maintainer isn't buying it so... we might have to
> keep it forever. Sigh...

Emil, What do you mean he "isn't buying it"?
(Might be worth splitting into another thread if this sparks a discussion)

> 
> -Emil