From: Jiri Olsa <jolsa@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <david.ahern@oracle.com>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 15/15] tools build: Fix feature_check name clash
Date: Wed, 11 Mar 2015 09:59:04 +0100 [thread overview]
Message-ID: <1426064344-21737-16-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1426064344-21737-1-git-send-email-jolsa@kernel.org>
We have 2 feature_check functions, which conflict with each other.
Fixing it by renaming the latter to feature_display_check.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
---
tools/build/Makefile.feature | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 4abaf5f09617..12e58703a364 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -134,14 +134,14 @@ ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)")
feature_display := 1
endif
-feature_check = $(eval $(feature_check_code))
-define feature_check_code
+feature_display_check = $(eval $(feature_check_code))
+define feature_display_check_code
ifneq ($(feature-$(1)), 1)
feature_display := 1
endif
endef
-$(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat)))
+$(foreach feat,$(FEATURE_DISPLAY),$(call feature_display_check,$(feat)))
ifeq ($(VF),1)
feature_display := 1
--
1.9.3
next prev parent reply other threads:[~2015-03-11 9:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-11 8:58 [PATCHv2 00/15] tools build: Move features framework into tools/build Jiri Olsa
2015-03-11 8:58 ` [PATCH 01/15] perf build: Disable default check for libbabeltrace Jiri Olsa
2015-03-13 15:36 ` Arnaldo Carvalho de Melo
2015-03-13 16:20 ` Jiri Olsa
2015-03-13 20:19 ` Arnaldo Carvalho de Melo
2015-03-15 17:32 ` Jiri Olsa
2015-03-11 8:58 ` [PATCH 02/15] perf build: Add dump of features build Jiri Olsa
2015-03-11 8:58 ` [PATCH 03/15] perf build: Fix pthread-attr-setaffinity-np include in test-all Jiri Olsa
2015-03-11 8:58 ` [PATCH 04/15] perf build: Get rid of LIB_INCLUDE variable Jiri Olsa
2015-03-11 8:58 ` [PATCH 05/15] perf build: Rename CORE_FEATURE_TESTS to FEATURE_TESTS Jiri Olsa
2015-03-11 8:58 ` [PATCH 06/15] perf build: Get rid of VF_FEATURE_TESTS Jiri Olsa
2015-03-11 8:58 ` [PATCH 07/15] perf build: Rename display_lib into feature_display Jiri Olsa
2015-03-11 8:58 ` [PATCH 08/15] perf build: Rename display_vf to feature_verbose Jiri Olsa
2015-03-11 8:58 ` [PATCH 09/15] perf build: Rename PERF-FEATURES into FEATURE-DUMP Jiri Olsa
2015-03-11 8:58 ` [PATCH 10/15] perf build: Rename feature_print_var_code to print_var_code Jiri Olsa
2015-03-11 8:59 ` [PATCH 11/15] perf build: Separate feature make support into config/Makefile.feature Jiri Olsa
2015-03-11 8:59 ` [PATCH 12/15] perf build: Make features checks directory configurable Jiri Olsa
2015-03-11 8:59 ` [PATCH 13/15] tools build: Move feature checks code under tools/build Jiri Olsa
2015-03-11 8:59 ` [PATCH 14/15] tools build: Allow to override feature checks setup Jiri Olsa
2015-03-11 8:59 ` Jiri Olsa [this message]
2015-03-18 18:50 ` [PATCHv2 00/15] tools build: Move features framework into tools/build Arnaldo Carvalho de Melo
2015-03-18 18:59 ` Jiri Olsa
2015-03-18 19:53 ` 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=1426064344-21737-16-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=david.ahern@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--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;
as well as URLs for NNTP newsgroup(s).