Mesa (master): automake: fix some occurrences of hardcoded -ldl and -lpthread

Emil Velikov evelikov at kemper.freedesktop.org
Tue Dec 1 16:49:34 UTC 2015


Module: Mesa
Branch: master
Commit: 99cd60083518ad4465e3e29996168e8fa8a89fbb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99cd60083518ad4465e3e29996168e8fa8a89fbb

Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Mon Nov 23 14:22:24 2015 +1100

automake: fix some occurrences of hardcoded -ldl and -lpthread

Correct some occurrences of -ldl and -lpthread to use
$(DLOPEN_LIBS) and $(PTHREAD_LIBS) respectively.

Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Cc: "11.0 11.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/gallium/targets/opencl/Makefile.am |    2 +-
 src/mesa/drivers/dri/i965/Makefile.am  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 3cb2976..08f95e8 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -20,7 +20,7 @@ lib at OPENCL_LIBNAME@_la_LIBADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(ELF_LIB) \
-	-ldl \
+	$(DLOPEN_LIBS) \
 	-lclangCodeGen \
 	-lclangFrontendTool \
 	-lclangFrontend \
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 9d003e4..ad687bf 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -51,7 +51,8 @@ libi965_compiler_la_SOURCES = $(i965_compiler_FILES)
 TEST_LIBS = \
 	libi965_compiler.la \
         ../../../libmesa.la \
-	-lpthread -ldl \
+	$(PTHREAD_LIBS) \
+	$(DLOPEN_LIBS) \
 	../common/libdri_test_stubs.la
 
 TESTS = \




More information about the mesa-commit mailing list