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

[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.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.

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.