lkml.org 
[lkml]   [2015]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/20] perf tools: Improve Python feature detection messages
    Date
    From: Ingo Molnar <mingo@kernel.org>

    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>
    ---
    tools/perf/config/Makefile | 11 +++++------
    1 file 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
    disable-python = $(eval $(disable-python_code))
    define disable-python_code
    CFLAGS += -DNO_LIBPYTHON
    - $(if $(1),$(warning No $(1) was found))
    - $(warning Python support will not be built)
    + $(warning $1)
    NO_LIBPYTHON := 1
    endef

    ifdef NO_LIBPYTHON
    - $(call disable-python)
    + $(call disable-python,Python support disabled by user)
    else

    ifndef PYTHON
    - $(call disable-python,python interpreter)
    + $(call disable-python,No python interpreter was found: disables Python support - please install python-devel/python-dev)
    else
    PYTHON_WORD := $(call shell-wordify,$(PYTHON))

    ifndef PYTHON_CONFIG
    - $(call disable-python,python-config tool)
    + $(call disable-python,No 'python-config' tool was found: disables Python support - please install python-devel/python-dev)
    else

    PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG))
    @@ -575,7 +574,7 @@ else
    FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)

    ifneq ($(feature-libpython), 1)
    - $(call disable-python,Python.h (for Python 2.x))
    + $(call disable-python,No 'Python.h' (for Python 2.x support) was found: disables Python support - please install python-devel/python-dev)
    else

    ifneq ($(feature-libpython-version), 1)
    --
    1.9.3


    \
     
     \ /
      Last update: 2015-03-03 05:01    [W:4.305 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site