From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>
Subject: [PATCH 4/7] perf tools: Move python/perf.so target into rules area
Date: Sun, 4 Dec 2016 21:42:55 +0100 [thread overview]
Message-ID: <1480884178-8072-5-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1480884178-8072-1-git-send-email-jolsa@kernel.org>
Following fixdep fix needs all targets at the same area,
so they'll fit under signal condition block.
Moving python/perf.so target into rules section and
intentionally removing the perl script related comment.
Link: http://lkml.kernel.org/n/tip-0xk7ca6fdvv6jg71lp40yj5x@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Makefile.perf | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 2e95456108d7..112f4f7bb200 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -262,17 +262,6 @@ python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT
PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)
PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI)
-$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)
- $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \
- CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \
- $(PYTHON_WORD) util/setup.py \
- --quiet build_ext; \
- mkdir -p $(OUTPUT)python && \
- cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/
-#
-# No Perl scripts right now:
-#
-
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
PROGRAMS += $(OUTPUT)perf
@@ -341,6 +330,14 @@ SHELL = $(SHELL_PATH)
all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
+$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)
+ $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \
+ CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \
+ $(PYTHON_WORD) util/setup.py \
+ --quiet build_ext; \
+ mkdir -p $(OUTPUT)python && \
+ cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/
+
please_set_SHELL_PATH_to_a_more_modern_shell:
$(Q)$$(:)
--
2.7.4
next prev parent reply other threads:[~2016-12-04 20:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 20:42 [PATCH 0/7] perf tools: Force fixdep to be built first Jiri Olsa
2016-12-04 20:42 ` [PATCH 1/7] tools build: Make the .cmd file more readable Jiri Olsa
2016-12-06 8:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 2/7] tools build: Move tabs to spaces where suitable Jiri Olsa
2016-12-06 8:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 3/7] perf tools: Move install-gtk target into rules area Jiri Olsa
2016-12-06 8:28 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` Jiri Olsa [this message]
2016-12-06 8:28 ` [tip:perf/core] perf tools: Move python/perf.so " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 5/7] perf tools: Force fixdep compilation at the start of the build Jiri Olsa
2016-12-05 20:02 ` Arnaldo Carvalho de Melo
2016-12-06 10:47 ` Jiri Olsa
2016-12-04 20:42 ` [PATCH 6/7] perf tools: Add non config targets Jiri Olsa
2016-12-06 8:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 7/7] perf tools: Cleanup build directory before each test Jiri Olsa
2016-12-06 8:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
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=1480884178-8072-5-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.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;
as well as URLs for NNTP newsgroup(s).