This looks good but, unfortunately, it seems to be breaking Travis build for the scons targets: https://travis-ci.org/Igalia/mesa/jobs/410431266
Please, Eric, could you try to see a way of solving this. I'm stuck not being able to create the 18.2 branch because of this build regression. On Tue, 2018-07-31 at 19:14 +0200, Juan A. Suarez Romero wrote: > CXXLD gallium_dri.la > ../../../../src/gallium/drivers/vc4/.libs/libvc4.a(vc4_cl_dump.o): In > function `vc4_dump_cl': > src/gallium/drivers/vc4/vc4_cl_dump.c:45: undefined reference to > `clif_dump_init' > src/gallium/drivers/vc4/vc4_cl_dump.c:82: undefined reference to > `clif_dump_destroy' > ../../../../src/broadcom/cle/.libs/libbroadcom_cle.a(cle_libbroadcom_cle_la-v3d_decoder.o): > In function `v3d_field_iterator_next': > src/broadcom/cle/v3d_decoder.c:902: undefined reference to `clif_lookup_bo' > > Fixes: e92959c4e0 ("v3d: Pass the whole clif_dump structure to > v3d_print_group().") > CC: Eric Anholt <e...@anholt.net> > --- > src/gallium/drivers/vc4/Automake.inc | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/src/gallium/drivers/vc4/Automake.inc > b/src/gallium/drivers/vc4/Automake.inc > index b1aa9726bd6..c9afa2478e9 100644 > --- a/src/gallium/drivers/vc4/Automake.inc > +++ b/src/gallium/drivers/vc4/Automake.inc > @@ -7,4 +7,11 @@ TARGET_LIB_DEPS += \ > $(top_builddir)/src/gallium/drivers/vc4/libvc4.la \ > $(top_builddir)/src/broadcom/cle/libbroadcom_cle.la > > +if !HAVE_GALLIUM_V3D > +TARGET_LIB_DEPS += \ > + $(top_builddir)/src/broadcom/libbroadcom.la \ > + $(top_builddir)/src/broadcom/libbroadcom_v33.la \ > + $(top_builddir)/src/broadcom/libbroadcom_v41.la > +endif > + > endif -- Br, Andres
signature.asc
Description: This is a digitally signed message part
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev