From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, acme@redhat.com, mingo@kernel.org,
hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org,
pi3orama@163.com, wangnan0@huawei.com, namhyung@kernel.org,
lizefan@huawei.com, linux-kernel@vger.kernel.org,
a.p.zijlstra@chello.nl
Subject: [tip:perf/core] perf build: Use FEATURE-DUMP in bpf subproject
Date: Sat, 9 Jan 2016 08:28:10 -0800 [thread overview]
Message-ID: <tip-58683600dfe377c883eb8217b5a9bfcfe231b3ff@git.kernel.org> (raw)
In-Reply-To: <1450893514-9158-6-git-send-email-jolsa@kernel.org>
Commit-ID: 58683600dfe377c883eb8217b5a9bfcfe231b3ff
Gitweb: http://git.kernel.org/tip/58683600dfe377c883eb8217b5a9bfcfe231b3ff
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 23 Dec 2015 18:58:34 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 6 Jan 2016 20:11:14 -0300
perf build: Use FEATURE-DUMP in bpf subproject
Using FEATURE-DUMP in bpf subproject for features detection in case bpf
is built via perf. Keeping the current features detection otherwise.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Wang Nan <wangnan0@huawei.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama <pi3orama@163.com>
Link: http://lkml.kernel.org/r/1450893514-9158-6-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/bpf/Makefile | 4 ++++
tools/perf/Makefile.perf | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index 636e3dd..919b717 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -80,7 +80,11 @@ endif
endif
ifeq ($(check_feat),1)
+ifeq ($(FEATURES_DUMP),)
include $(srctree)/tools/build/Makefile.feature
+else
+include $(FEATURES_DUMP)
+endif
endif
export prefix libdir src obj
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 569fcf0..404e3b1 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -436,7 +436,7 @@ $(LIBAPI)-clean:
$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null
$(LIBBPF): fixdep FORCE
- $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a
+ $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a FEATURES_DUMP=$(realpath $(OUTPUT)FEATURE-DUMP)
$(LIBBPF)-clean:
$(call QUIET_CLEAN, libbpf)
next prev parent reply other threads:[~2016-01-09 16:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 17:58 [PATCH 0/5] tools build: Make FEATURE_DUMP include makefile Jiri Olsa
2015-12-23 17:58 ` [PATCH 1/5] tools build feature: Fix feature_check_display_code typo Jiri Olsa
2016-01-09 16:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-12-23 17:58 ` [PATCH 2/5] tools build feature: Move dwarf post unwind choice output into perf Jiri Olsa
2016-01-09 16:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-12-23 17:58 ` [PATCH 3/5] tools build feature: Introduce feature_ass macro Jiri Olsa
2016-01-09 16:27 ` [tip:perf/core] tools build feature: Introduce feature_assign macro tip-bot for Jiri Olsa
2015-12-23 17:58 ` [PATCH 4/5] tools build feature: Use value assignment form for FEATURE-DUMP file Jiri Olsa
2016-01-09 16:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-12-23 17:58 ` [PATCH 5/5] perf build: Use FEATURE-DUMP in bpf subproject Jiri Olsa
2016-01-09 16:28 ` tip-bot for Jiri Olsa [this message]
2015-12-24 2:52 ` [PATCH 0/5] tools build: Make FEATURE_DUMP include makefile Wangnan (F)
2015-12-27 11:58 ` Jiri Olsa
2016-01-04 21:06 ` Arnaldo Carvalho de Melo
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=tip-58683600dfe377c883eb8217b5a9bfcfe231b3ff@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=pi3orama@163.com \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.