[Mesa-dev] [PATCH 3/3] Revert "Revert "targets/opencl: Link against libgallium.la instead of libgallium.a""

[Tom Stellard]

On Sat, Jan 19, 2013 at 01:33:44AM +0000, Mike Lothian wrote:
> I've tried enabling --with-llvm-shared-libs on my mesa build - for graphics
> rather than opencl - however it's unable to render anything
> 
> Even glxgears just shows garbage - have you tested this method at all?
> Should it work? I'm trying to figure out if this is something I've done
> wrong within my configuration or I'm simply not supposed to be doing this
>
I tested these patches on a number of configurations, but I could have missed
one.

Make sure you have the most up to date version of both Mesa and my LLVM
tree: http://cgit.freedesktop.org/~tstellar/llvm/log/ The most recent
commits to these trees depend on each other, so if you don't have the
latest updates from both trees, nothing will work.

-Tom

> Cheers
> 
> Mike
> 
> 
> On 18 January 2013 16:58, Tom Stellard <tom at stellard.net> wrote:
> 
> > From: Tom Stellard <thomas.stellard at amd.com>
> >
> > This reverts commit 7824ab807050c03c6df01c44774914dcbef88248.
> >
> > Now that we force linking with LLVM shared libs when building clover,
> > we can link against libgallium.la with no problems.
> > ---
> >  src/gallium/auxiliary/Makefile.am      | 6 ------
> >  src/gallium/targets/opencl/Makefile.am | 4 +---
> >  2 files changed, 1 insertion(+), 9 deletions(-)
> >
> > diff --git a/src/gallium/auxiliary/Makefile.am
> > b/src/gallium/auxiliary/Makefile.am
> > index 4979293..a4eee47 100644
> > --- a/src/gallium/auxiliary/Makefile.am
> > +++ b/src/gallium/auxiliary/Makefile.am
> > @@ -45,9 +45,3 @@ util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
> >
> >  util/u_format_table.c: $(srcdir)/util/u_format_table.py
> > $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py
> > $(srcdir)/util/u_format.csv
> >         $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py
> > $(srcdir)/util/u_format.csv > $@
> > -
> > -# XXX: As a work around for
> > https://bugs.freedesktop.org/show_bug.cgi?id=59334
> > -# clover needs to link against libgallium.a. Delete this once we have a
> > real
> > -# fix for this bug.
> > -all-local: libgallium.la
> > -       ln -f $(builddir)/.libs/libgallium.a $(builddir)/libgallium.a
> > diff --git a/src/gallium/targets/opencl/Makefile.am
> > b/src/gallium/targets/opencl/Makefile.am
> > index be8ec12..c5c3003 100644
> > --- a/src/gallium/targets/opencl/Makefile.am
> > +++ b/src/gallium/targets/opencl/Makefile.am
> > @@ -6,11 +6,9 @@ libOpenCL_la_LDFLAGS = \
> >         $(LLVM_LDFLAGS) \
> >         -version-number 1:0
> >
> > -# We are linking against libgallium.a rather than libgallium.la to work
> > around
> > -# https://bugs.freedesktop.org/show_bug.cgi?id=59334
> >  libOpenCL_la_LIBADD = \
> >         $(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
> > -       $(top_builddir)/src/gallium/auxiliary/libgallium.a \
> > +       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
> >         $(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) \
> >         -ldl \
> >         -lclangCodeGen \
> > --
> > 1.7.11.4
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >