Messages in this thread | | | Date | Thu, 1 Dec 2022 10:41:47 +0100 | From | Alexander Gordeev <> | Subject | Re: [PATCH] perf build: Fixes for LIBTRACEEVENT_DYNAMIC |
| |
On Tue, Nov 29, 2022 at 11:29:24AM -0800, Ian Rogers wrote: > If LIBTRACEEVENT_DYNAMIC is enabled then avoid the install step for > the plugins. If disabled correct DESTDIR so that the plugins are > installed under <lib>/traceevent/plugins. > > Fixes: ef019df01e20 ("perf build: Install libtraceevent locally when building") > Reported-by: Alexander Gordeev <agordeev@linux.ibm.com> > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/Makefile.perf | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index a17a6ea85e81..f4cd946fe91a 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins > > install-traceevent-plugins: libtraceevent_plugins > $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ > - DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \ > + DESTDIR=$(DESTDIR_SQ) prefix= \ > $(LIBTRACEEVENT_FLAGS) install > endif > > @@ -1093,7 +1093,11 @@ install-tests: all install-gtk > $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' > $(Q)$(MAKE) -C tests/shell/coresight install-tests > > -install-bin: install-tools install-tests install-traceevent-plugins > +install-bin: install-tools install-tests > + > +ifndef LIBTRACEEVENT_DYNAMIC > +install-bin: install-traceevent-plugins > +endif > > install: install-bin try-install-man > > -- > 2.38.1.584.g0f3c55d4c2-goog
Tested-by: Alexander Gordeev <agordeev@linux.ibm.com>
| |