On 03/18/2015 11:38 AM, Mark Janes wrote:
4bdbb588a9d385509f9168e38bfdb76952ba469c introduced link errors for i965 gtests. This commit links the tests with libglapi, which contains the missing symbols. --- src/mesa/drivers/dri/i965/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 235bcfe..f828f00 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -67,24 +67,28 @@ check_PROGRAMS = $(TESTS) test_fs_cmod_propagation_SOURCES = \ test_fs_cmod_propagation.cpp test_fs_cmod_propagation_LDADD = \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/gtest/libgtest.la \ $(TEST_LIBS) test_fs_saturate_propagation_SOURCES = \ test_fs_saturate_propagation.cpp test_fs_saturate_propagation_LDADD = \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/gtest/libgtest.la \ $(TEST_LIBS) test_vf_float_conversions_SOURCES = \ test_vf_float_conversions.cpp test_vf_float_conversions_LDADD = \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/gtest/libgtest.la \ $(TEST_LIBS) test_vec4_register_coalesce_SOURCES = \ test_vec4_register_coalesce.cpp test_vec4_register_coalesce_LDADD = \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/gtest/libgtest.la \ $(TEST_LIBS) @@ -92,9 +96,13 @@ test_vec4_copy_propagation_SOURCES = \ test_vec4_copy_propagation.cpp test_vec4_copy_propagation_LDADD = \ $(top_builddir)/src/gtest/libgtest.la \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(TEST_LIBS) test_eu_compact_SOURCES = \ test_eu_compact.c nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp -test_eu_compact_LDADD = $(TEST_LIBS) +test_eu_compact_LDADD = \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ + $(TEST_LIBS) +
That doesn't seem to help when I configure/build as Vinson describes in https://bugs.freedesktop.org/show_bug.cgi?id=89662
I ran make check before I submitted my patches but I used a different ./configure command then.
I don't know how to fix this yet. -Brian _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
