Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a5c13af authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo 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: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d3665498

tools/perf/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -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 && \

tools/perf/util/python-ext-sources

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#

# 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

tools/perf/util/setup.py

+4 −4
Original line number Diff line number Diff line
@@ -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,

                 )