diff mbox series

trace-cmd: Allow setting of the name of Python in pkgconfig

Message ID 20190725204237.3864194-1-chutzpah@gentoo.org (mailing list archive)
State Accepted
Commit 23518372c046f03dba0848aee87e060f30f5ffc7
Headers show
Series trace-cmd: Allow setting of the name of Python in pkgconfig | expand

Commit Message

Patrick McLean July 25, 2019, 8:42 p.m. UTC
From: Patrick McLean <patrick.mclean@sony.com>

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.

Signed-off-by: Patrick McLean <patrick.mclean@sony.com>
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Steven Rostedt July 25, 2019, 11:08 p.m. UTC | #1
On Thu, 25 Jul 2019 13:42:37 -0700
Patrick McLean <chutzpah@gentoo.org> wrote:

> From: Patrick McLean <patrick.mclean@sony.com>
> 
> 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.

Applied. Thanks Patrick!

-- Steve

> 
> Signed-off-by: Patrick McLean <patrick.mclean@sony.com>
> ---
>  Makefile | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 3e63e9e..3afd982 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 3e63e9e..3afd982 100644
--- a/Makefile
+++ b/Makefile
@@ -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