From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755268AbbCBPLE (ORCPT <rfc822;w@1wt.eu>);
	Mon, 2 Mar 2015 10:11:04 -0500
Received: from mail.kernel.org ([198.145.29.136]:56489 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754086AbbCBPLB (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 2 Mar 2015 10:11:01 -0500
Date: Mon, 2 Mar 2015 12:10:54 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, David Ahern <david.ahern@oracle.com>,
        Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] perf tools: Improve Python feature detection messages
Message-ID: <20150302151054.GB5538@kernel.org>
References: <1425064989-26440-1-git-send-email-acme@kernel.org>
 <20150228081248.GA31856@gmail.com>
 <20150228083345.GB31887@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150228083345.GB31887@gmail.com>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <mingo@kernel.org>

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)