[Mesa-dev] [Patch v2] osmesa: link with libunwind if enabled (v2)

[Brian Paul]

On 05/25/2017 09:09 PM, Alexandre Demers wrote:
> Fixes linking error in libOSmesa when using libunwind.
>
> CXXLD    libOSMesa.la
> src/gallium/auxiliary/.libs/libgallium.a(u_debug_stack.o): In function `symbol_name_cached':
> ./src/gallium/auxiliary/util/u_debug_stack.c:87: undefined reference to `_ULx86_64_get_proc_name'
> src/gallium/auxiliary/.libs/libgallium.a(u_debug_stack.o): In function `debug_backtrace_capture':
> ./src/gallium/auxiliary/util/u_debug_stack.c:114: undefined reference to `_Ux86_64_getcontext'
> ./src/gallium/auxiliary/util/u_debug_stack.c:115: undefined reference to `_ULx86_64_init_local'
> ./src/gallium/auxiliary/util/u_debug_stack.c:117: undefined reference to `_ULx86_64_step'
> ./src/gallium/auxiliary/util/u_debug_stack.c:123: undefined reference to `_ULx86_64_get_reg'
> ./src/gallium/auxiliary/util/u_debug_stack.c:124: undefined reference to `_ULx86_64_get_proc_info'
> ./src/gallium/auxiliary/util/u_debug_stack.c:120: undefined reference to `_ULx86_64_step'
> collect2: error: ld returned 1 exit status
>
> v2 : Fixes title and adds the original error it is fixing.
>
> Signed-off-by: Alexandre Demers <alexandre.f.demers at gmail.com>
> ---
>   src/gallium/targets/osmesa/Makefile.am | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
> index 6d340f1d92..2b4af57d5b 100644
> --- a/src/gallium/targets/osmesa/Makefile.am
> +++ b/src/gallium/targets/osmesa/Makefile.am
> @@ -66,7 +66,8 @@ lib at OSMESA_LIB@_la_LIBADD = \
>   	$(top_builddir)/src/mapi/glapi/libglapi.la \
>   	$(SHARED_GLAPI_LIB) \
>   	$(OSMESA_LIB_DEPS) \
> -	$(CLOCK_LIB)
> +	$(CLOCK_LIB) \
> +	$(LIBUNWIND_LIBS)
>
>   if HAVE_GALLIUM_LLVM
>   AM_CPPFLAGS += -DGALLIUM_LLVMPIPE

Looks OK to me.

Reviewed-by: Brian Paul <brianp at vmware.com>

Do you need me to push this for you?

-Brian