lkml.org 
[lkml]   [2012]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Fix build dependency of perf python extension
    Commit-ID:  6a5c13aff49ac9b3fea38d5f84b436718cb2780d
    Gitweb: http://git.kernel.org/tip/6a5c13aff49ac9b3fea38d5f84b436718cb2780d
    Author: Namhyung Kim <namhyung@gmail.com>
    AuthorDate: Sun, 12 Feb 2012 19:45:24 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 13 Feb 2012 18:01:25 -0200

    perf tools: Fix build dependency of perf python extension

    The perf python extention (perf.so) file lacks its dependencies in the
    Makefile so that it cannot be refreshed if one of source files it depends
    is changed. Fix it by putting them in a separate file and processing it in
    both of Makefile and setup.py.

    Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://lkml.kernel.org/r/1329043524-12470-1-git-send-email-namhyung@gmail.com
    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Makefile | 5 ++++-
    tools/perf/util/python-ext-sources | 17 +++++++++++++++++
    tools/perf/util/setup.py | 8 ++++----
    3 files changed, 25 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 64df5de..8359fa1 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -183,7 +183,10 @@ SCRIPT_SH += perf-archive.sh
    grep-libs = $(filter -l%,$(1))
    strip-libs = $(filter-out -l%,$(1))

    -$(OUTPUT)python/perf.so: $(PYRF_OBJS)
    +PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)
    +PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py
    +
    +$(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
    $(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \
    --quiet build_ext; \
    mkdir -p $(OUTPUT)python && \
    diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
    new file mode 100644
    index 0000000..ff606f4
    --- /dev/null
    +++ b/tools/perf/util/python-ext-sources
    @@ -0,0 +1,17 @@
    +#
    +# List of files needed by perf python extention
    +#
    +# Each source file must be placed on its own line so that it can be
    +# processed by Makefile and util/setup.py accordingly.
    +#
    +
    +util/python.c
    +util/ctype.c
    +util/evlist.c
    +util/evsel.c
    +util/cpumap.c
    +util/thread_map.c
    +util/util.c
    +util/xyarray.c
    +util/cgroup.c
    +util/debugfs.c
    diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
    index 36d4c56..d0f9f29 100644
    --- a/tools/perf/util/setup.py
    +++ b/tools/perf/util/setup.py
    @@ -24,11 +24,11 @@ cflags += getenv('CFLAGS', '').split()
    build_lib = getenv('PYTHON_EXTBUILD_LIB')
    build_tmp = getenv('PYTHON_EXTBUILD_TMP')

    +ext_sources = [f.strip() for f in file('util/python-ext-sources')
    + if len(f.strip()) > 0 and f[0] != '#']
    +
    perf = Extension('perf',
    - sources = ['util/python.c', 'util/ctype.c', 'util/evlist.c',
    - 'util/evsel.c', 'util/cpumap.c', 'util/thread_map.c',
    - 'util/util.c', 'util/xyarray.c', 'util/cgroup.c',
    - 'util/debugfs.c'],
    + sources = ext_sources,
    include_dirs = ['util/include'],
    extra_compile_args = cflags,
    )

    \
     
     \ /
      Last update: 2012-02-17 10:47    [W:0.026 / U:17.956 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site