diff options
author | Patrick McLean <patrick.mclean@sony.com> | 2019-07-25 13:42:37 -0700 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-25 19:07:25 -0400 |
commit | 23518372c046f03dba0848aee87e060f30f5ffc7 (patch) | |
tree | d14029d5b44f3699e0e726220022be2fc6d70e90 | |
parent | cb525176be1279034c9a7853a5deea355815e28b (diff) | |
download | trace-cmd-23518372c046f03dba0848aee87e060f30f5ffc7.tar.gz |
trace-cmd: Allow setting of the name of Python in pkgconfig
Some vendors use different names for Python in pkgconfig, this allows
the name of the Python version in pkgconfig to differ from the Python
interperter name. The default remains the Python version.
Link: http://lore.kernel.org/linux-trace-devel/20190725204237.3864194-1-chutzpah@gentoo.org
Signed-off-by: Patrick McLean <patrick.mclean@sony.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -115,9 +115,10 @@ PYTHON := ctracecmd.so PYTHON_GUI := ctracecmd.so ctracecmdgui.so PYTHON_VERS ?= python +PYTHON_PKGCONFIG_VERS ?= $(PYTHON_VERS) # Can build python? -ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y) +ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_PKGCONFIG_VERS) > /dev/null 2>&1 && echo y"), y) PYTHON_PLUGINS := plugin_python.so BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS) BUILD_PYTHON_WORKS := 1 @@ -387,8 +388,8 @@ report_nopythondev: force $(Q)echo ifndef NO_PYTHON -PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)` -PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \ +PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_PKGCONFIG_VERS)` +PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_PKGCONFIG_VERS)` \ $(shell $(PYTHON_VERS)-config --ldflags) PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0` else |