Commit-ID: 95d061c8a9f36e8c2cc458f97bc67716571b3fee Gitweb: http://git.kernel.org/tip/95d061c8a9f36e8c2cc458f97bc67716571b3fee Author: Ingo Molnar <[email protected]> AuthorDate: Mon, 30 Sep 2013 15:40:04 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Oct 2013 08:48:44 +0200
tools/perf/build: Split out feature check: 'libpython-version' Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- tools/perf/config/Makefile | 3 ++- tools/perf/config/feature-checks/Makefile | 4 ++++ .../feature-checks/{test-libpython.c => test-libpython-version.c} | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 595c0e0..63ba069 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -120,6 +120,7 @@ FEATURE_TESTS = \ gtk2-infobar \ libperl \ libpython \ + libpython-version \ libnuma $(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test))) @@ -372,7 +373,7 @@ else $(call disable-python,Python.h (for Python 2.x)) else - ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED),python version),y) + ifneq ($(feature-libpython-version), 1) $(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) diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index e7ed05a..d15074d 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile @@ -18,6 +18,7 @@ FILES= \ test-gtk2-infobar \ test-libperl \ test-libpython \ + test-libpython-version \ test-libnuma CC := $(CC) -MD @@ -108,6 +109,9 @@ FLAGS_PYTHON_EMBED = $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) test-libpython: $(BUILD) $(FLAGS_PYTHON_EMBED) +test-libpython-version: + $(BUILD) $(FLAGS_PYTHON_EMBED) + -include *.d */*.d ############################### diff --git a/tools/perf/config/feature-checks/test-libpython.c b/tools/perf/config/feature-checks/test-libpython-version.c similarity index 50% copy from tools/perf/config/feature-checks/test-libpython.c copy to tools/perf/config/feature-checks/test-libpython-version.c index 7226797..facea12 100644 --- a/tools/perf/config/feature-checks/test-libpython.c +++ b/tools/perf/config/feature-checks/test-libpython-version.c @@ -1,7 +1,10 @@ #include <Python.h> -# + +#if PY_VERSION_HEX >= 0x03000000 + #error +#endif + int main(void) { - Py_Initialize(); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
