[Mesa-dev] [PATCH] gallium/clover: Remove libxmlconfig.la from targets/clover/Makefile.am

[Aaron Watry]

On Fri, Aug 4, 2017 at 4:08 AM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> 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.haehnle at amd.com>
>>> Cc: Emil Velikov <emil.velikov at 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 at 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'm completely ok with an alternative approach, what I sent last night
was just what got the build working for me again, and I wanted to
start a conversation about how to fix this issue.  Probably should've
RFC'd this patch.

Nicolai/Emil: For reference, my r600g (Thuban + Barts) system is
currently built with the following configure line:

CXXFLAGS=' -O0 -g' CFLAGS=' -O0  -g' LD='ld.gold' LDFLAGS='' CC='gcc'
CXX='g++' \
/home/awatry/src/mesa/configure --prefix=/usr/local
--with-dri-drivers= --with-dri-driverdir=/usr/local/lib/dri
--enable-debug --enable-dri3 --with-llvm-prefix=/usr/local
--enable-opencl --enable-glx-tls --with-platforms=drm,x11
--enable-texture-float --enable-va --enable-gallium-tests
--with-gallium-drivers=r600,swrast

My RadeonSI system (Ryzen R7 1700 + PITCAIRN) is currently built with:
CXXFLAGS=' -O0 -g' CFLAGS=' -O0 -march=native -g' LD='ld.gold'
LDFLAGS='' CC='gcc' CXX='g++' /home/awatry/src/mesa/autogen.sh
--prefix=/usr/local --with-dri-drivers=
--with-dri-driverdir=/usr/local/lib/dri --enable-debug --enable-dri3
--enable-nine --with-llvm-prefix=/usr/local --enable-opencl
--enable-opencl-icd=yes --enable-glx-tls --with-platforms=drm,x11
--enable-gles1 --enable-gles2 --enable-texture-float --enable-va
--enable-gallium-tests --with-gallium-drivers=radeonsi,r600,swrast
--with-vulkan-drivers=radeon

--Aaron

>
> Cheers,
> Nicolai
>
>
>>
>> Thanks,
>> Nicolai
>>
>>>       $(EXPAT_LIBS) \
>>>       $(LIBELF_LIBS) \
>>>       $(DLOPEN_LIBS) \
>>>
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>
>
> --
> Lerne, wie die Welt wirklich ist,
> Aber vergiss niemals, wie sie sein sollte.