lkml.org 
[lkml]   [2013]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/25] perf tools: Move libpython check config into config/Makefile
    Date
    Moving libpython check config into config/Makefile.

    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: David Ahern <dsahern@gmail.com>
    ---
    tools/perf/Makefile | 68 ++--------------------------------------------
    tools/perf/config/Makefile | 63 ++++++++++++++++++++++++++++++++++++++++++
    2 files changed, 66 insertions(+), 65 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index f856bb5..061de65 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -196,8 +196,6 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
    #
    PROGRAMS += $(OUTPUT)perf

    -LANG_BINDINGS =
    -
    # what 'all' will build and 'install' will install, in perfexecdir
    ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)

    @@ -535,69 +533,9 @@ ifndef NO_LIBPERL
    LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o
    endif

    -disable-python = $(eval $(disable-python_code))
    -define disable-python_code
    - BASIC_CFLAGS += -DNO_LIBPYTHON
    - $(if $(1),$(warning No $(1) was found))
    - $(warning Python support will not be built)
    -endef
    -
    -override PYTHON := \
    - $(call get-executable-or-default,PYTHON,python)
    -
    -ifndef PYTHON
    - $(call disable-python,python interpreter)
    -else
    -
    - PYTHON_WORD := $(call shell-wordify,$(PYTHON))
    -
    - ifdef NO_LIBPYTHON
    - $(call disable-python)
    - else
    -
    - override PYTHON_CONFIG := \
    - $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON)-config)
    -
    - ifndef PYTHON_CONFIG
    - $(call disable-python,python-config tool)
    - else
    -
    - 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)
    -
    - ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED),python),y)
    - $(call disable-python,Python.h (for Python 2.x))
    - else
    -
    - ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED),python version),y)
    - $(warning Python 3 is not yet supported; please set)
    - $(warning PYTHON and/or PYTHON_CONFIG appropriately.)
    - $(warning If you also have Python 2 installed, then)
    - $(warning try something like:)
    - $(warning $(and ,))
    - $(warning $(and ,) make PYTHON=python2)
    - $(warning $(and ,))
    - $(warning Otherwise, disable Python support entirely:)
    - $(warning $(and ,))
    - $(warning $(and ,) make NO_LIBPYTHON=1)
    - $(warning $(and ,))
    - $(error $(and ,))
    - else
    - ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
    - EXTLIBS += $(PYTHON_EMBED_LIBADD)
    - LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o
    - LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o
    - LANG_BINDINGS += $(OUTPUT)python/perf.so
    - endif
    -
    - endif
    - endif
    - endif
    +ifndef NO_LIBPYTHON
    + LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o
    + LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o
    endif

    ifdef NO_DEMANGLE
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 2c9e0a5..d5e0386 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -261,3 +261,66 @@ else
    EXTLIBS += $(PERL_EMBED_LIBADD)
    endif
    endif
    +
    +disable-python = $(eval $(disable-python_code))
    +define disable-python_code
    + BASIC_CFLAGS += -DNO_LIBPYTHON
    + $(if $(1),$(warning No $(1) was found))
    + $(warning Python support will not be built)
    + NO_LIBPYTHON := 1
    +endef
    +
    +override PYTHON := \
    + $(call get-executable-or-default,PYTHON,python)
    +
    +ifndef PYTHON
    + $(call disable-python,python interpreter)
    +else
    +
    + PYTHON_WORD := $(call shell-wordify,$(PYTHON))
    +
    + ifdef NO_LIBPYTHON
    + $(call disable-python)
    + else
    +
    + override PYTHON_CONFIG := \
    + $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON)-config)
    +
    + ifndef PYTHON_CONFIG
    + $(call disable-python,python-config tool)
    + else
    +
    + 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)
    +
    + ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED),python),y)
    + $(call disable-python,Python.h (for Python 2.x))
    + else
    +
    + ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED),python version),y)
    + $(warning Python 3 is not yet supported; please set)
    + $(warning PYTHON and/or PYTHON_CONFIG appropriately.)
    + $(warning If you also have Python 2 installed, then)
    + $(warning try something like:)
    + $(warning $(and ,))
    + $(warning $(and ,) make PYTHON=python2)
    + $(warning $(and ,))
    + $(warning Otherwise, disable Python support entirely:)
    + $(warning $(and ,))
    + $(warning $(and ,) make NO_LIBPYTHON=1)
    + $(warning $(and ,))
    + $(error $(and ,))
    + else
    + ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
    + EXTLIBS += $(PYTHON_EMBED_LIBADD)
    + LANG_BINDINGS += $(OUTPUT)python/perf.so
    + endif
    + endif
    + endif
    + endif
    +endif
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-05-24 15:21    [W:4.038 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site