From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
bpf@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>,
Ian Rogers <irogers@google.com>,
Alexander Gordeev <agordeev@linux.ibm.com>
Subject: [PATCH 1/3] perf build: Fixes for LIBTRACEEVENT_DYNAMIC
Date: Mon, 5 Dec 2022 14:59:38 -0800 [thread overview]
Message-ID: <20221205225940.3079667-2-irogers@google.com> (raw)
In-Reply-To: <20221205225940.3079667-1-irogers@google.com>
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..6689f644782f 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) 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.39.0.rc0.267.gcb52ba06e7-goog
next prev parent reply other threads:[~2022-12-05 23:00 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 22:59 [PATCH 0/3] libtraceevent from system and build fix Ian Rogers
2022-12-05 22:59 ` Ian Rogers [this message]
2022-12-05 22:59 ` [PATCH 2/3] perf build: Use libtraceevent from the system Ian Rogers
2022-12-06 16:15 ` Arnaldo Carvalho de Melo
2022-12-06 16:20 ` Arnaldo Carvalho de Melo
2022-12-06 16:23 ` Arnaldo Carvalho de Melo
2022-12-06 16:30 ` Arnaldo Carvalho de Melo
2022-12-06 16:37 ` Arnaldo Carvalho de Melo
2022-12-06 16:41 ` Arnaldo Carvalho de Melo
2022-12-06 17:01 ` Arnaldo Carvalho de Melo
2022-12-06 17:07 ` Arnaldo Carvalho de Melo
2022-12-06 17:13 ` Arnaldo Carvalho de Melo
2022-12-06 17:31 ` Arnaldo Carvalho de Melo
2022-12-06 22:22 ` Ian Rogers
2022-12-07 14:21 ` [ALMOST ready] " Arnaldo Carvalho de Melo
2022-12-07 14:31 ` Arnaldo Carvalho de Melo
2022-12-07 14:33 ` Arnaldo Carvalho de Melo
2022-12-07 14:39 ` Steven Rostedt
2022-12-07 16:02 ` Arnaldo Carvalho de Melo
2022-12-07 16:56 ` Arnaldo Carvalho de Melo
2022-12-07 17:00 ` Ian Rogers
2022-12-07 14:37 ` Arnaldo Carvalho de Melo
2022-12-07 13:38 ` Athira Rajeev
2022-12-07 17:27 ` Arnaldo Carvalho de Melo
2022-12-07 17:31 ` Arnaldo Carvalho de Melo
2022-12-07 17:43 ` Arnaldo Carvalho de Melo
2022-12-08 6:51 ` Athira Rajeev
2022-12-08 22:04 ` Arnaldo Carvalho de Melo
2022-12-08 22:32 ` Arnaldo Carvalho de Melo
2022-12-08 23:00 ` Ian Rogers
2022-12-08 23:05 ` Ian Rogers
2022-12-12 14:13 ` Arnaldo Carvalho de Melo
2022-12-12 14:28 ` Arnaldo Carvalho de Melo
2022-12-09 6:34 ` Athira Rajeev
2022-12-12 13:51 ` Arnaldo Carvalho de Melo
2022-12-13 9:53 ` Athira Rajeev
2022-12-13 22:09 ` Ian Rogers
2022-12-13 22:33 ` Arnaldo Carvalho de Melo
2022-12-13 22:47 ` Ian Rogers
2022-12-15 7:10 ` Athira Rajeev
2022-12-07 13:33 ` Athira Rajeev
2022-12-07 13:46 ` Athira Rajeev
2022-12-07 16:16 ` Ian Rogers
2022-12-07 16:52 ` Arnaldo Carvalho de Melo
2022-12-05 22:59 ` [PATCH 3/3] perf build: Fix python/perf.so library's name Ian Rogers
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=20221205225940.3079667-2-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=agordeev@linux.ibm.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bpf@vger.kernel.org \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
/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