Module: Mesa
Branch: 9.1
Commit: 8818d01d3319a4e460c8bc444d0b4f451a73be2f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8818d01d3319a4e460c8bc444d0b4f451a73be2f

Author: Andreas Boll <andreas.boll....@gmail.com>
Date:   Thu Feb 21 19:31:40 2013 +0100

llvmpipe/build: add DLOPEN_LIBS and PTHREAD_LIBS to the lp_test_* targets

Fixes undefined symbols.

NOTE: This is a candidate for the 9.1 branch.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61052
Tested-by: Vinson Lee <v...@freedesktop.org>
Reviewed-by: Jose Fonseca <jfons...@vmware.com>
(cherry picked from commit c1f2c3a80fa555287fd756832a05587fab8b79bd)

---

 src/gallium/drivers/llvmpipe/Makefile.am |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/Makefile.am 
b/src/gallium/drivers/llvmpipe/Makefile.am
index 78cb95d..f1ba5d1 100644
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -85,23 +85,30 @@ check_PROGRAMS = \
        lp_test_printf
 TESTS = $(check_PROGRAMS)
 
+TEST_LIBS = \
+           libllvmpipe.la \
+           $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+           $(LLVM_LIBS) \
+           $(DLOPEN_LIBS) \
+           $(PTHREAD_LIBS)
+
 lp_test_format_SOURCES = lp_test_format.c lp_test_main.c
-lp_test_format_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la 
$(LLVM_LIBS)
+lp_test_format_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_format_SOURCES = dummy.cpp
 
 lp_test_arit_SOURCES = lp_test_arit.c lp_test_main.c
-lp_test_arit_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_arit_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_arit_SOURCES = dummy.cpp
 
 lp_test_blend_SOURCES = lp_test_blend.c lp_test_main.c
-lp_test_blend_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_blend_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_blend_SOURCES = dummy.cpp
 
 lp_test_conv_SOURCES = lp_test_conv.c lp_test_main.c
-lp_test_conv_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+lp_test_conv_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_conv_SOURCES = dummy.cpp
 
 lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
-lp_test_printf_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la 
$(LLVM_LIBS)
+lp_test_printf_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to