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

[Eric Engestrom]

On Tue, Oct 11, 2016 at 06:36:11PM +0200, Nicolai Hähnle wrote:
> On 11.10.2016 18:17, Eric Engestrom wrote:
> > 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?
> 
> Believe me, I double-checked.
> 
> Are you sure you're looking in the right place? There are two different
> places that generate files based on the xml files, and only the place
> related to shared glapi is broken -- leading to inconsistent glapi tables
> which lead to wrong GL functions being called.
> 
> In other words: yes, if you touch an xml file then make will currently do
> something. It just won't do _enough_.

Sorry, my testing was basically just `touch src/mapi/glapi/gen/*.xml && make`
and see that this and its friends appear:
	GEN      ../../../../src/mapi/glapi/glapi_mapi_tmp.h
You're right not to trust what I said, I didn't check any of the generated
results.  Sorry :/

> 
> Cheers,
> Nicolai
> 
> > 
> > > 
> > > 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