From 8ef7e5b7026d06a803f0bf75fe323c14f142db3a Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Fri, 27 Jan 2017 16:21:19 +0900 Subject: tests: Use -pthread in CFLAGS instead of -lpthread -lpthread is not always a valid flag to pull pthread support, especially on Android it will fail to link due to a missing libpthread.so. The more generic way to build-in pthread support is to use the -pthread CFLAG, so let's use it instead. Signed-off-by: Tomasz Figa [Emil Velikov: rebase on top of previous commit] Signed-off-by: Emil Velikov --- tests/exynos/Makefile.am | 4 ++-- tests/modetest/Makefile.am | 4 ++-- tests/nouveau/Makefile.am | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am index 357d6b8c..b6361727 100644 --- a/tests/exynos/Makefile.am +++ b/tests/exynos/Makefile.am @@ -1,4 +1,5 @@ AM_CFLAGS = \ + -pthread \ $(WARN_CFLAGS)\ -I $(top_srcdir)/include/drm \ -I $(top_srcdir)/libkms/ \ @@ -34,8 +35,7 @@ exynos_fimg2d_perf_LDADD = \ exynos_fimg2d_event_LDADD = \ $(top_builddir)/libdrm.la \ - $(top_builddir)/exynos/libdrm_exynos.la \ - -lpthread + $(top_builddir)/exynos/libdrm_exynos.la exynos_fimg2d_test_LDADD = \ $(top_builddir)/libdrm.la \ diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index 9686ccb9..4b296c83 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -3,6 +3,7 @@ include Makefile.sources AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) AM_CFLAGS += \ + -pthread \ -I$(top_srcdir)/include/drm \ -I$(top_srcdir)/tests \ -I$(top_srcdir) @@ -20,5 +21,4 @@ modetest_SOURCES = $(MODETEST_FILES) modetest_LDADD = \ $(top_builddir)/libdrm.la \ $(top_builddir)/tests/util/libutil.la \ - $(CAIRO_LIBS) \ - -lpthread + $(CAIRO_LIBS) diff --git a/tests/nouveau/Makefile.am b/tests/nouveau/Makefile.am index 225d6e64..3c799a81 100644 --- a/tests/nouveau/Makefile.am +++ b/tests/nouveau/Makefile.am @@ -1,4 +1,5 @@ AM_CFLAGS = \ + -pthread \ $(WARN_CFLAGS) \ -I$(top_srcdir)/include/drm \ -I$(top_srcdir)/nouveau \ @@ -7,7 +8,7 @@ AM_CFLAGS = \ LDADD = \ ../../nouveau/libdrm_nouveau.la \ ../../libdrm.la \ - -ldl -lpthread + -ldl TESTS = threaded -- cgit v1.2.3