From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756344AbcAIQ2M (ORCPT ); Sat, 9 Jan 2016 11:28:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41826 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756317AbcAIQ2K (ORCPT ); Sat, 9 Jan 2016 11:28:10 -0500 Date: Sat, 9 Jan 2016 08:27:51 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: lizefan@huawei.com, dsahern@gmail.com, acme@redhat.com, jolsa@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, hpa@zytor.com, pi3orama@163.com, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, a.p.zijlstra@chello.nl Reply-To: a.p.zijlstra@chello.nl, namhyung@kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, pi3orama@163.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, lizefan@huawei.com In-Reply-To: <1450893514-9158-5-git-send-email-jolsa@kernel.org> References: <1450893514-9158-5-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build feature: Use value assignment form for FEATURE-DUMP file Git-Commit-ID: 936d120d5f6406377e622da3167cafc811d053ea 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: 936d120d5f6406377e622da3167cafc811d053ea Gitweb: http://git.kernel.org/tip/936d120d5f6406377e622da3167cafc811d053ea Author: Jiri Olsa AuthorDate: Wed, 23 Dec 2015 18:58:33 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 6 Jan 2016 20:11:14 -0300 tools build feature: Use value assignment form for FEATURE-DUMP file Changing the contents of the FEATURE-DUMP file, so it looks like: feature-backtrace=1 feature-dwarf=0 feature-fortify-source=1 feature-sync-compare-and-swap=0 This way it could get included in sub projects, so they won't be forced to redo features detection. Also now storing the complete set of features. 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-5-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Makefile.feature | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index b1b262e..02db3cd 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -129,8 +129,24 @@ endef feature_assign = feature-$(1)=$(feature-$(1)) FEATURE_DUMP_FILENAME = $(OUTPUT)FEATURE-DUMP$(FEATURE_USER) -FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),$(call feature_assign,$(feat))) -FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME)) +FEATURE_DUMP := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME)) + +feature_dump_check = $(eval $(feature_dump_check_code)) +define feature_dump_check_code + ifeq ($(findstring $(1),$(FEATURE_DUMP)),) + $(2) := 1 + endif +endef + +# +# First check if any test from FEATURE_DISPLAY +# and set feature_display := 1 if it does +$(foreach feat,$(FEATURE_DISPLAY),$(call feature_dump_check,$(call feature_assign,$(feat)),feature_display)) + +# +# Now also check if any other test changed, +# so we force FEATURE-DUMP generation +$(foreach feat,$(FEATURE_TESTS),$(call feature_dump_check,$(call feature_assign,$(feat)),feature_dump_changed)) # The $(feature_display) controls the default detection message # output. It's set if: @@ -139,9 +155,9 @@ FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_ # - one of the $(FEATURE_DISPLAY) is not detected # - VF is enabled -ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)") - $(shell echo "$(FEATURE_DUMP)" > $(FEATURE_DUMP_FILENAME)) - feature_display := 1 +ifeq ($(feature_dump_changed),1) + $(shell rm -f $(FEATURE_DUMP_FILENAME)) + $(foreach feat,$(FEATURE_TESTS),$(shell echo "$(call feature_assign,$(feat))" >> $(FEATURE_DUMP_FILENAME))) endif feature_display_check = $(eval $(feature_check_display_code))