[Mesa-dev] [PATCH] i965: Link test programs with gtest before pthreads.

Ian Romanick idr at freedesktop.org
Mon Feb 23 13:20:26 PST 2015


If you add a bit to the commit message that says this works around
problems with --Wl,--as-needed,

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 02/21/2015 10:43 PM, Matt Turner wrote:
> Cc: "10.5" <mesa-stable at lists.freedesktop.org>
> Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540962
> ---
>  src/mesa/drivers/dri/i965/Makefile.am | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
> index 9230a49..235bcfe 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.am
> +++ b/src/mesa/drivers/dri/i965/Makefile.am
> @@ -67,32 +67,32 @@ check_PROGRAMS = $(TESTS)
>  test_fs_cmod_propagation_SOURCES = \
>  	test_fs_cmod_propagation.cpp
>  test_fs_cmod_propagation_LDADD = \
> -	$(TEST_LIBS) \
> -	$(top_builddir)/src/gtest/libgtest.la
> +	$(top_builddir)/src/gtest/libgtest.la \
> +	$(TEST_LIBS)
>  
>  test_fs_saturate_propagation_SOURCES = \
>  	test_fs_saturate_propagation.cpp
>  test_fs_saturate_propagation_LDADD = \
> -	$(TEST_LIBS) \
> -	$(top_builddir)/src/gtest/libgtest.la
> +	$(top_builddir)/src/gtest/libgtest.la \
> +	$(TEST_LIBS)
>  
>  test_vf_float_conversions_SOURCES = \
>  	test_vf_float_conversions.cpp
>  test_vf_float_conversions_LDADD = \
> -	$(TEST_LIBS) \
> -	$(top_builddir)/src/gtest/libgtest.la
> +	$(top_builddir)/src/gtest/libgtest.la \
> +	$(TEST_LIBS)
>  
>  test_vec4_register_coalesce_SOURCES = \
>  	test_vec4_register_coalesce.cpp
>  test_vec4_register_coalesce_LDADD = \
> -        $(TEST_LIBS) \
> -        $(top_builddir)/src/gtest/libgtest.la
> +        $(top_builddir)/src/gtest/libgtest.la \
> +        $(TEST_LIBS)
>  
>  test_vec4_copy_propagation_SOURCES = \
>  	test_vec4_copy_propagation.cpp
>  test_vec4_copy_propagation_LDADD = \
> -        $(TEST_LIBS) \
> -        $(top_builddir)/src/gtest/libgtest.la
> +        $(top_builddir)/src/gtest/libgtest.la \
> +        $(TEST_LIBS)
>  
>  test_eu_compact_SOURCES = \
>  	test_eu_compact.c
> 



More information about the mesa-dev mailing list