On 07/08/15 19:19, Alexander von Gluck IV wrote: > This was causing a failure to build on SCons due to a missing > -Isrc/egl. Instead of adding in that path, lets just -Isrc/ > and include "utils/u_atomic.h".
Hmm nice one! Before the commit dri2 wasn't attempted on Haiku. With the patch one, I've added it by mistake causing this problem. Seems that 2/2 should come first (in a shorter form) and this one ought to be second. Patch looks great, just a small request - please reword the commit message a bit. I'm thinking of the following but feel free to tweak to your liking. "egl/dri2: straighten u_atomic.h include Earlier commit e7e29189e27(scons: rework the EGL build) squashed the different SConscripts, unintentionally adding dri2 sources for the haiku build (fixed with previous commit). That did point out that the way we include u_atomics.h is not so robust. Add $(top)/src and fix the include. " > --- > src/egl/Makefile.am | 1 + > src/egl/SConscript | 1 + > src/egl/drivers/dri2/egl_dri2.c | 2 +- > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am > index be7bfe9..5c2ba30 100644 > --- a/src/egl/Makefile.am > +++ b/src/egl/Makefile.am > @@ -25,6 +25,7 @@ AM_CFLAGS = \ > -I$(top_srcdir)/include \ > -I$(top_srcdir)/src/egl/main \ > -I$(top_srcdir)/src/gbm/main \ > + -I$(top_srcdir)/src \ > $(DEFINES) \ > $(VISIBILITY_CFLAGS) \ > $(LIBDRM_CFLAGS) \ > diff --git a/src/egl/SConscript b/src/egl/SConscript > index a7f6282..1b2a427 100644 > --- a/src/egl/SConscript > +++ b/src/egl/SConscript > @@ -9,6 +9,7 @@ env = env.Clone() > env.Append(CPPPATH = [ > '#/include', > '#/src/egl/main', > + '#/src', After we swap the order and this becomes patch 2/2 we can drop this change. With that the patch is Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> Thanks! Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
