Am 04.08.2017 16:29, schrieb Jan Vesely:
On Fri, 2017-08-04 at 15:02 +0100, Emil Velikov wrote:
On 4 August 2017 at 11:36, Dieter Nützel <die...@nuetzel-hh.de> wrote:
> Am 04.08.2017 11:08, schrieb Nicolai Hähnle:
> >
> > On 04.08.2017 10:27, Nicolai Hähnle wrote:
> > >
> > > On 04.08.2017 06:24, Aaron Watry wrote:
> > > >
> > > > Gets rid of a bunch of errors like the following:
> > > >
> > > > make[4]: Entering directory
> > > > '/home/me/src/mesa/build/src/gallium/targets/opencl'
> > > > CXXLD libOpenCL.la
> > > > ../../../../src/util/.libs/libxmlconfig.a(libxmlconfig_la-xmlconfig.o):
> > > > In function `driParseOptionInfo':
> > > > /home/me/src/mesa/src/util/xmlconfig.c:719: multiple definition of
> > > > `driParseOptionInfo'
> > > >
> > > >
../../../../src/gallium/auxiliary/pipe-loader/.libs/libpipe_loader_dynamic.a(libxmlconfig_la-xmlconfig.o):/home/me/src/mesa/src/util/xmlconfig.c:719:
> > > > first defined here
> > > > ../../../../src/util/.libs/libxmlconfig.a(libxmlconfig_la-xmlconfig.o):
> > > > In function `driParseConfigFiles':
> > > > /home/me/src/mesa/src/util/xmlconfig.c:990: multiple definition of
> > > > `driParseConfigFiles'
> > > >
> > > >
../../../../src/gallium/auxiliary/pipe-loader/.libs/libpipe_loader_dynamic.a(libxmlconfig_la-xmlconfig.o):/home/me/src/mesa/src/util/xmlconfig.c:990:
> > > > first defined here
> > > >
> > > > Fixes: 33f7d71d5358337f ("pipe-loader: fix build of dynamic
> > > > pipe-drivers")
> > > > Cc: Nicolai Hähnle <nicolai.haeh...@amd.com>
> > > > Cc: Emil Velikov <emil.veli...@collabora.com>
> > > > ---
> > > > src/gallium/targets/opencl/Makefile.am | 1 -
> > > > 1 file changed, 1 deletion(-)
> > > >
> > > > diff --git a/src/gallium/targets/opencl/Makefile.am
> > > > b/src/gallium/targets/opencl/Makefile.am
> > > > index e88fa0fd38..c9d2be7afd 100644
> > > > --- a/src/gallium/targets/opencl/Makefile.am
> > > > +++ b/src/gallium/targets/opencl/Makefile.am
> > > > @@ -19,7 +19,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
> > > > $(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
> > > > $(top_builddir)/src/gallium/auxiliary/libgallium.la \
> > > > $(top_builddir)/src/util/libmesautil.la \
> > > > - $(top_builddir)/src/util/libxmlconfig.la \
> > >
> > >
> > > So, this is weird because I added this line to make one of the Travis CI
> > > builds pass. What are your ./configure options?
> >
> >
> > Okay, so the difference is HAVE_CLOVER_ICD. Apparently there's no
> > Travis CI build with that set to false. We need to figure out a way to
> > make both options happy.
I don't think that's the case, I use --enable-opencl_icd and I still
need to remove that line to fix the build.
Me too, even after Emil's latest commits
# 6f9298dbde63049da6f530ba4f4693ba78b01448 and
# 5c007203b73da88b9e76ce28027c6d27661e45b1
with --enable-nine --enable-opencl
Dieter
> >
> > Cheers,
> > Nicolai
>
>
> This is the same for me (like I posted with my latest Tested-by: for
> you)...;-)
>
> ./autogen.sh --prefix=/usr/local --with-dri-drivers=""
> --with-gallium-drivers=r600,radeonsi,swrast --with-platforms=drm,x11
> --enable-nine --enable-texture-float --enable-opencl
> --with-vulkan-drivers=radeon
>
> With OpenCL.
>
> So this is
>
> Tested-by: Dieter Nützel <die...@nuetzel-hh.de>
>
I'm not too sure that this is the right solution.
If I'm reading things correctly this will cause a break if one toggles
dri --disable-dri.
does it need to depend on HAVE_DRICOMMON? can't we just unconditionally
add libxmlconfig.la?
Jan
AFAICT the thing that gets us is the transient inclusion of
xmlconfig.la in loader.la.
I'm testing some patches to untangling this properly.
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
