[Mesa-dev] [PATCH 1/6] targets/egl-static: link with libmesautil.la

[Emil Velikov]

On 04/08/14 21:38, Brian Paul wrote:
> On 08/04/2014 02:21 PM, Emil Velikov wrote:
>> On 04/08/14 21:16, Brian Paul wrote:
>>> ---
>>>   src/gallium/targets/egl-static/Makefile.am |    5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/src/gallium/targets/egl-static/Makefile.am
>>> b/src/gallium/targets/egl-static/Makefile.am
>>> index 84f3338..ff053e2 100644
>>> --- a/src/gallium/targets/egl-static/Makefile.am
>>> +++ b/src/gallium/targets/egl-static/Makefile.am
>>> @@ -64,6 +64,7 @@ egl_gallium_la_SOURCES = \
>>>   egl_gallium_la_LIBADD = \
>>>       $(top_builddir)/src/loader/libloader.la \
>>>       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
>>> +    $(top_builddir)/src/util/libmesautil.la \
>>>       $(top_builddir)/src/gallium/drivers/identity/libidentity.la \
>>>       $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
>>>       $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
>>> @@ -108,7 +109,8 @@ AM_CPPFLAGS += \
>>>       -DFEATURE_GL=1
>>>
>>>   egl_gallium_la_LIBADD += \
>>> -    $(top_builddir)/src/mesa/libmesagallium.la
>>> +    $(top_builddir)/src/mesa/libmesagallium.la \
>>> +    $(top_builddir)/src/util/libmesautil.la
>> Guessing that this will cause duplicate symbols and the build will fail ?
> 
> Yeah, I didn't mean to send this patch.  Disregard.
> 
Seems like the series is required due to the "odd" way we build with scons -
there is a single mesa static library, whereas autohell does mesa and mesagallium.

-Emil

> 
> -Brian
> 
>