perf tools: Fix NO_NEWT=1 python build error

Fix the following build error:

     GEN python/perf.so
 In file included from util/evsel.h:10,
                  from util/python.c:6:
 util/hist.h:106:18: error: newt.h: No such file or directory
 error: command 'x86_64-pc-linux-gnu-gcc' failed with exit status 1
 make: *** [python/perf.so] Error 1

by passing BASIC_CFLAGS to setup.py. BASIC_CFLAGS variable contains
the -DNO_NEWT_SUPPORT switch which prevents building python c
extension with newt.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <20110329180236.GA19366@erda.amd.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 158c30e8210c64f7bde2915a7fee4700ee6a4cdd..207dee5c5b163fd51ceafbb6b171df9c0708893f 100644 (file)
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -165,8 +165,12 @@ grep-libs = $(filter -l%,$(1))
 strip-libs = $(filter-out -l%,$(1))
 
 $(OUTPUT)python/perf.so: $(PYRF_OBJS)
-       $(QUIET_GEN)python util/setup.py --quiet  build_ext --build-lib='$(OUTPUT)python' \
-                                               --build-temp='$(OUTPUT)python/temp'
+       $(QUIET_GEN)( \
+               export CFLAGS="$(BASIC_CFLAGS)"; \
+               python util/setup.py --quiet  build_ext --build-lib='$(OUTPUT)python' \
+                       --build-temp='$(OUTPUT)python/temp' \
+       )
+
 #
 # No Perl scripts right now:
 #

diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
index e24ffadb20b29f91cd835914512c7fc9a3f08215..bbc982f5dd8b9ced999577ced4822a21c9a28779 100644 (file)
--- a/tools/perf/util/setup.py
+++ b/tools/perf/util/setup.py
@@ -1,13 +1,18 @@
 #!/usr/bin/python2
 
 from distutils.core import setup, Extension
+from os import getenv
+
+cflags = ['-fno-strict-aliasing', '-Wno-write-strings']
+cflags += getenv('CFLAGS', '').split()
 
 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'],
                  include_dirs = ['util/include'],
-                 extra_compile_args = ['-fno-strict-aliasing', '-Wno-write-strings'])
+                 extra_compile_args = cflags,
+                 )
 
 setup(name='perf',
       version='0.1',