Re: [PATCH 1/2] perf tools: Fix make PYTHON override

[Thomas Ilsche]

Hi Namhyung,

On 2014-07-25 05:14, Namhyung Kim wrote:
> Thomas reported that make PYTHON=python2 is not work on some systems.
> I can reproduce it on my ArchLinux box too.
> 
> This is because it's overridden by config/feature-checks/Makefile
> regardless of PYTHON setting.  I guess it's a bug slipped into during
> the feature checking change.
> 
> Actually, we don't need to check python-config in the feature-checks.
> We can just pass appropriate FEATURE_CHECK_*FLAGS.

The patch works fine for me.

Thanks,
Thomas

> 
> Reported-by: Thomas Ilsche <thomas.ilsche@xxxxxxxxxxxxx>
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
>  tools/perf/config/Makefile                | 34 ++++++++++++++++++++-----------
>  tools/perf/config/feature-checks/Makefile | 18 ++--------------
>  2 files changed, 24 insertions(+), 28 deletions(-)
> 
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> index 1f67aa02d240..e05d8f99424d 100644
> --- a/tools/perf/config/Makefile
> +++ b/tools/perf/config/Makefile
> @@ -120,6 +120,23 @@ ifdef PARSER_DEBUG
>    CFLAGS             += -DPARSER_DEBUG
>  endif
>  
> +ifndef NO_LIBPYTHON
> +  override PYTHON := \
> +    $(call get-executable-or-default,PYTHON,python)
> +  override PYTHON_CONFIG := \
> +    $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON)-config)
> +
> +  PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG))
> +
> +  PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)
> +  PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)
> +
> +  FEATURE_CHECK_CFLAGS-libpython := $(PYTHON_EMBED_CCOPTS)
> +  FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)
> +  FEATURE_CHECK_CFLAGS-libpython-version := $(PYTHON_EMBED_CCOPTS)
> +  FEATURE_CHECK_LDFLAGS-libpython-version := $(PYTHON_EMBED_LDOPTS)
> +endif
> +
>  CFLAGS += -fno-omit-frame-pointer
>  CFLAGS += -ggdb3
>  CFLAGS += -funwind-tables
> @@ -482,21 +499,14 @@ define disable-python_code
>    NO_LIBPYTHON := 1
>  endef
>  
> -override PYTHON := \
> -  $(call get-executable-or-default,PYTHON,python)
> -
> -ifndef PYTHON
> -  $(call disable-python,python interpreter)
> +ifdef NO_LIBPYTHON
> +  $(call disable-python)
>  else
>  
> -  PYTHON_WORD := $(call shell-wordify,$(PYTHON))
> -
> -  ifdef NO_LIBPYTHON
> -    $(call disable-python)
> +  ifndef PYTHON
> +    $(call disable-python,python interpreter)
>    else
> -
> -    override PYTHON_CONFIG := \
> -      $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON)-config)
> +    PYTHON_WORD := $(call shell-wordify,$(PYTHON))
>  
>      ifndef PYTHON_CONFIG
>        $(call disable-python,python-config tool)
> diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
> index 6088f8d8a434..72ab2984718e 100644
> --- a/tools/perf/config/feature-checks/Makefile
> +++ b/tools/perf/config/feature-checks/Makefile
> @@ -101,25 +101,11 @@ FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
>  test-libperl.bin:
>  	$(BUILD) $(FLAGS_PERL_EMBED)
>  
> -override PYTHON := python
> -override PYTHON_CONFIG := python-config
> -
> -escape-for-shell-sq =  $(subst ','\'',$(1))
> -shell-sq = '$(escape-for-shell-sq)'
> -
> -PYTHON_CONFIG_SQ = $(call shell-sq,$(PYTHON_CONFIG))
> -
> -PYTHON_EMBED_LDOPTS = $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)
> -PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
> -PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS))
> -PYTHON_EMBED_CCOPTS = $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)
> -FLAGS_PYTHON_EMBED = $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
> -
>  test-libpython.bin:
> -	$(BUILD) $(FLAGS_PYTHON_EMBED)
> +	$(BUILD)
>  
>  test-libpython-version.bin:
> -	$(BUILD) $(FLAGS_PYTHON_EMBED)
> +	$(BUILD)
>  
>  test-libbfd.bin:
>  	$(BUILD) -DPACKAGE='"perf"' -lbfd -lz -liberty -ldl
> 

-- 
Dipl. Inf. Thomas Ilsche
Computer Scientist
Highly Adaptive Energy-Efficient Computing
CRC 912 HAEC: http://tu-dresden.de/sfb912
Technische Universität Dresden
Center for Information Services and High Performance Computing (ZIH)
01062 Dresden, Germany

Phone: +49 351 463-42168
Fax: +49 351 463-3773
E-Mail: thomas.ilsche@xxxxxxxxxxxxx

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature