Em Sat, Feb 28, 2015 at 09:33:45AM +0100, Ingo Molnar escreveu:
> 
> Change the Python detection message from:
> 
>   config/Makefile:566: No python-config tool was found
>   config/Makefile:566: Python support will not be built
> 
> To:
> 
>   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 <[email protected]>

These patches came with no --- separating the log message from the patch
and the following hunk has no line number info for where to apply the
first hunk, fixing these up for you.

- Arnaldo
 
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> index c3570b5f3bf3..44a14bd40e96 100644
> --- a/tools/perf/config/Makefile
> +++ b/tools/perf/config/Makefile
>  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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to