| Message ID | 20190228141828.2567-5-tvrtko.ursulin@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [i-g-t,1/5] lib/i915: Assert mmap size alignment | expand |
Quoting Tvrtko Ursulin (2019-02-28 14:18:28) > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Probably a leftover from test renames: > > 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> > --- > tests/Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/Makefile.am b/tests/Makefile.am > index c5dd210c7163..80bc5f92a13b 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -131,7 +131,7 @@ 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 > +i915_pm_rc6_residency_LDADD = $(LDADD) -lrt Have we not snuck -lrt into the core library yet, pretty sure libigt.la now includes clock_gettime() and so must be pulling it in already? i.e. can we just drop the above line? -Chris
On 28/02/2019 14:33, Chris Wilson wrote: > Quoting Tvrtko Ursulin (2019-02-28 14:18:28) >> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> >> Probably a leftover from test renames: >> >> 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> >> --- >> tests/Makefile.am | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/Makefile.am b/tests/Makefile.am >> index c5dd210c7163..80bc5f92a13b 100644 >> --- a/tests/Makefile.am >> +++ b/tests/Makefile.am >> @@ -131,7 +131,7 @@ 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 >> +i915_pm_rc6_residency_LDADD = $(LDADD) -lrt > > Have we not snuck -lrt into the core library yet, pretty sure libigt.la > now includes clock_gettime() and so must be pulling it in already? > > i.e. can we just drop the above line? Looks like it. And many more in this case. Regards, Tvrtko
diff --git a/tests/Makefile.am b/tests/Makefile.am index c5dd210c7163..80bc5f92a13b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -131,7 +131,7 @@ 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 +i915_pm_rc6_residency_LDADD = $(LDADD) -lrt prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)