From: Jiri Olsa <jolsa@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@redhat.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@elte.hu>, Paul Mackerras <paulus@samba.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Borislav Petkov <bp@alien8.de>,
Stephane Eranian <eranian@google.com>,
Sam Ravnborg <sam@ravnborg.org>, David Ahern <dsahern@gmail.com>
Subject: [PATCH 13/26] perf tools: Move libpython check config into config/Makefile
Date: Wed, 24 Apr 2013 11:37:40 +0200 [thread overview]
Message-ID: <1366796273-4780-14-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1366796273-4780-1-git-send-email-jolsa@redhat.com>
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 d0ab4d4..899ef12 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -198,8 +198,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)
@@ -537,69 +535,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
next prev parent reply other threads:[~2013-04-24 9:44 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-24 9:37 [PATCHv2 00/26] perf tools: Makefile changes Jiri Olsa
2013-04-24 9:37 ` [PATCH 01/26] perf tools: Add automated make test suite Jiri Olsa
2013-04-25 9:05 ` Namhyung Kim
2013-04-24 9:37 ` [PATCH 02/26] perf tools: Fix tab vs spaces issue in Makefile ifdef/endif Jiri Olsa
2013-05-31 11:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-04-24 9:37 ` [PATCH 03/26] perf tools: Move arch check into config/Makefile Jiri Olsa
2013-04-25 9:15 ` Namhyung Kim
2013-04-26 11:37 ` Jiri Olsa
2013-04-26 16:18 ` Jiri Olsa
2013-05-06 2:03 ` Namhyung Kim
2013-04-24 9:37 ` [PATCH 04/26] perf tools: Move programs " Jiri Olsa
2013-04-24 9:37 ` [PATCH 05/26] perf tools: Move compiler and linker flags " Jiri Olsa
2013-04-24 9:37 ` [PATCH 06/26] perf tools: Move libelf check config " Jiri Olsa
2013-04-24 9:37 ` [PATCH 07/26] perf tools: Move libdw " Jiri Olsa
2013-04-24 9:37 ` [PATCH 08/26] perf tools: Move libunwind " Jiri Olsa
2013-04-24 9:37 ` [PATCH 09/26] perf tools: Move libaudit " Jiri Olsa
2013-04-24 9:37 ` [PATCH 10/26] perf tools: Move slang " Jiri Olsa
2013-04-24 9:37 ` [PATCH 11/26] perf tools: Move gtk2 " Jiri Olsa
2013-04-24 9:37 ` [PATCH 12/26] perf tools: Move libperl " Jiri Olsa
2013-04-24 9:37 ` Jiri Olsa [this message]
2013-04-24 9:37 ` [PATCH 14/26] perf tools: Move libbfd " Jiri Olsa
2013-04-24 9:37 ` [PATCH 15/26] perf tools: Move stdlib " Jiri Olsa
2013-04-24 9:37 ` [PATCH 16/26] perf tools: Move libnuma " Jiri Olsa
2013-04-24 9:37 ` [PATCH 17/26] perf tools: Move paths " Jiri Olsa
2013-04-24 9:37 ` [PATCH 18/26] perf tools: Final touches for CHK config move Jiri Olsa
2013-04-24 9:37 ` [PATCH 19/26] perf tools: Merge all *CFLAGS* make variable into CFLAGS Jiri Olsa
2013-04-24 9:37 ` [PATCH 20/26] perf tools: Merge all *LDFLAGS* make variable into LDFLAGS Jiri Olsa
2013-04-24 9:37 ` [PATCH 21/26] perf tools: Switch to full patch C include directories Jiri Olsa
2013-04-26 16:26 ` David Ahern
2013-04-29 10:02 ` Jiri Olsa
2013-04-24 9:37 ` [PATCH 22/26] perf tools: Add NO_BIONIC variable to confiure bionic setup Jiri Olsa
2013-04-24 9:37 ` [PATCH 23/26] perf tools: Replace tabs with spaces for all non-commands statements Jiri Olsa
2013-04-24 9:37 ` [PATCH 24/26] perf tools: Replace multiple line assignment with multiple statements Jiri Olsa
2013-04-24 9:37 ` [PATCH 25/26] perf tools: Remove '?=' Makefile STRIP assignment Jiri Olsa
2013-04-24 9:37 ` [PATCH 26/26] perf tools: Add missing liblk.a dependency for python/perf.so Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366796273-4780-14-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=bp@alien8.de \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®