public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Intel-gfx@lists.freedesktop.org,
	Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: [igt-dev] [PATCH i-g-t 2/2] automake: Make librt mandatory
Date: Fri,  1 Mar 2019 10:32:02 +0000	[thread overview]
Message-ID: <20190301103202.11778-2-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20190301103202.11778-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

librt is required by libintel_tools so express it as mandatory in autoconf
and also drop explicit mentions from Makefile.am.

This also fixes a build warning of:

  tests/Makefile.am:134: warning: variable 'pm_rc6_residency_LDADD' is defined but no program or
  tests/Makefile.am:134: library has 'pm_rc6_residency' as canonical name (possible typo)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 benchmarks/Makefile.am | 2 +-
 configure.ac           | 4 ++--
 tests/Makefile.am      | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index c166d636d507..1f05adf31527 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -24,5 +24,5 @@ gem_exec_tracer_la_LIBADD = -ldl
 gem_latency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_latency_LDADD = $(LDADD) -lpthread
 gem_syslatency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_syslatency_LDADD = $(LDADD) -lpthread -lrt
+gem_syslatency_LDADD = $(LDADD) -lpthread
 gem_wsim_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la -lpthread
diff --git a/configure.ac b/configure.ac
index e22703d03198..a3f541a2f888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,12 +58,12 @@ AX_GCC_FUNC_ATTRIBUTE([constructor])
 dnl Check for POSIX timers
 AC_CHECK_FUNCS(timer_create, [], [
 	AC_CHECK_LIB(rt, timer_create, [
-		AC_DEFINE(HAVE_TIMER_CREATE, 1)
 		TIMER_LIBS="-lrt"
 		], [
 		AC_CHECK_LIB(pthread, timer_create, [
-			AC_DEFINE(HAVE_TIMER_CREATE, 1)
 			TIMER_LIBS="-lpthread"
+		], [
+		AC_MSG_ERROR([Failed to find library containing timer_create.])
 		])
 	])
 ])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c5dd210c7163..289249b42b97 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -128,10 +128,7 @@ gem_userptr_blits_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_userptr_blits_LDADD = $(LDADD) -lpthread
 perf_pmu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
 
-gem_eio_LDADD = $(LDADD) -lrt
-gem_wait_LDADD = $(LDADD) -lrt
-kms_flip_LDADD = $(LDADD) -lrt -lpthread
-pm_rc6_residency_LDADD = $(LDADD) -lrt
+kms_flip_LDADD = $(LDADD) -lpthread
 
 prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-- 
2.19.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  reply	other threads:[~2019-03-01 10:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-01 10:32 [igt-dev] [PATCH i-g-t 1/2] autoconf: Silence void pointer arithmetic warnings Tvrtko Ursulin
2019-03-01 10:32 ` Tvrtko Ursulin [this message]
2019-03-01 10:44   ` [igt-dev] [PATCH i-g-t 2/2] automake: Make librt mandatory Chris Wilson
2019-03-01 10:38 ` [igt-dev] [PATCH i-g-t 1/2] autoconf: Silence void pointer arithmetic warnings Chris Wilson
2019-03-01 13:19 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] " Patchwork
2019-03-01 16:17 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190301103202.11778-2-tvrtko.ursulin@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=tvrtko.ursulin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox