From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756390AbcAIQ2d (ORCPT ); Sat, 9 Jan 2016 11:28:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41840 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755698AbcAIQ2a (ORCPT ); Sat, 9 Jan 2016 11:28:30 -0500 Date: Sat, 9 Jan 2016 08:28:10 -0800 From: tip-bot for Jiri Olsa Message-ID: 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 Reply-To: pi3orama@163.com, wangnan0@huawei.com, jolsa@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, lizefan@huawei.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, mingo@kernel.org In-Reply-To: <1450893514-9158-6-git-send-email-jolsa@kernel.org> References: <1450893514-9158-6-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Use FEATURE-DUMP in bpf subproject Git-Commit-ID: 58683600dfe377c883eb8217b5a9bfcfe231b3ff X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 58683600dfe377c883eb8217b5a9bfcfe231b3ff Gitweb: http://git.kernel.org/tip/58683600dfe377c883eb8217b5a9bfcfe231b3ff Author: Jiri Olsa AuthorDate: Wed, 23 Dec 2015 18:58:34 +0100 Committer: Arnaldo Carvalho de Melo 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 Tested-by: Wang Nan Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama Link: http://lkml.kernel.org/r/1450893514-9158-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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)