diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-28 03:33:45 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-02 10:13:51 -0500 |
commit | 6c5aa23704e2786eb1a2a733165eef95c4375f41 (patch) | |
tree | b0d44365d1229a574907a386d108482a6c35f56d /tools | |
parent | a6a76ba9ea03fe22eb28a6a19482d547b8773001 (diff) |
perf tools: Improve Python feature detection messages
Change the Python detection message from:
config/Makefile:566: No python-config tool was found
config/Makefile:566: Python support will not be built
config/Makefile:565: No 'python-config' tool was found: disables Python support - please install python-devel/python-dev
It's now a standard one-line message with a package install suggestion,
and it also uses the standard language used by other feature detection
messages.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150228083345.GB31887@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/config/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index c3570b5f3bf3..d3efeef58ded 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -548,22 +548,21 @@ endif | |||
548 | disable-python = $(eval $(disable-python_code)) | 548 | disable-python = $(eval $(disable-python_code)) |
549 | define disable-python_code | 549 | define disable-python_code |
550 | CFLAGS += -DNO_LIBPYTHON | 550 | CFLAGS += -DNO_LIBPYTHON |
551 | $(if $(1),$(warning No $(1) was found)) | 551 | $(warning $1) |
552 | $(warning Python support will not be built) | ||
553 | NO_LIBPYTHON := 1 | 552 | NO_LIBPYTHON := 1 |
554 | endef | 553 | endef |
555 | 554 | ||
556 | ifdef NO_LIBPYTHON | 555 | ifdef NO_LIBPYTHON |
557 | $(call disable-python) | 556 | $(call disable-python,Python support disabled by user) |
558 | else | 557 | else |
559 | 558 | ||
560 | ifndef PYTHON | 559 | ifndef PYTHON |
561 | $(call disable-python,python interpreter) | 560 | $(call disable-python,No python interpreter was found: disables Python support - please install python-devel/python-dev) |
562 | else | 561 | else |
563 | PYTHON_WORD := $(call shell-wordify,$(PYTHON)) | 562 | PYTHON_WORD := $(call shell-wordify,$(PYTHON)) |
564 | 563 | ||
565 | ifndef PYTHON_CONFIG | 564 | ifndef PYTHON_CONFIG |
566 | $(call disable-python,python-config tool) | 565 | $(call disable-python,No 'python-config' tool was found: disables Python support - please install python-devel/python-dev) |
567 | else | 566 | else |
568 | 567 | ||
569 | PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG)) | 568 | PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG)) |
@@ -575,7 +574,7 @@ else | |||
575 | FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) | 574 | FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) |
576 | 575 | ||
577 | ifneq ($(feature-libpython), 1) | 576 | ifneq ($(feature-libpython), 1) |
578 | $(call disable-python,Python.h (for Python 2.x)) | 577 | $(call disable-python,No 'Python.h' (for Python 2.x support) was found: disables Python support - please install python-devel/python-dev) |
579 | else | 578 | else |
580 | 579 | ||
581 | ifneq ($(feature-libpython-version), 1) | 580 | ifneq ($(feature-libpython-version), 1) |