[PATCH 1/1] trace-cmd: use pkg-config instead of python-config

[PATCH 1/1] trace-cmd: use pkg-config instead of python-config

[Romain Naour]

From: Romain <romain.naour@openwide.fr>

trace-cmd use python-config to find out which headers
and libraries should be used to link against the Python libraries.
By default, python-config returns paths that are inappropriate for
cross-compilation.

Add PYTHON_VERS to build trace-cmd with python2 or python3

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1964949..2f862ec 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,10 @@ ifndef NO_PYTHON
 PYTHON		:= ctracecmd.so
 PYTHON_GUI	:= ctracecmd.so ctracecmdgui.so
 
+PYTHON_VERS ?= python
+
 # Can build python?
-ifeq ($(shell sh -c "python-config --includes > /dev/null 2>&1 && echo y"), y)
+ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y)
 	PYTHON_PLUGINS := plugin_python.so
 	BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS)
 	PYTHON_SO_INSTALL := ctracecmd.install
@@ -550,8 +552,8 @@ clean:
 
 ##### PYTHON STUFF #####
 
-PYTHON_INCLUDES = `python-config --includes`
-PYTHON_LDFLAGS = `python-config --ldflags` \
+PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)`
+PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \
 		$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')")
 PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
 
-- 
1.8.1.4

Re: [PATCH 1/1] trace-cmd: use pkg-config instead of python-config

[Steven Rostedt]

Please Cc me on trace-cmd patches.

Johannes and Darren,

Since you handle the python bindings in trace-cmd, can you give me an
ack or nack.

Thanks!

-- Steve


On Thu, 31 Oct 2013 18:39:42 +0100
Romain Naour <romain.naour@openwide.fr> wrote:

> From: Romain <romain.naour@openwide.fr>
> 
> trace-cmd use python-config to find out which headers
> and libraries should be used to link against the Python libraries.
> By default, python-config returns paths that are inappropriate for
> cross-compilation.
> 
> Add PYTHON_VERS to build trace-cmd with python2 or python3
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  Makefile | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 1964949..2f862ec 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -81,8 +81,10 @@ ifndef NO_PYTHON
>  PYTHON		:= ctracecmd.so
>  PYTHON_GUI	:= ctracecmd.so ctracecmdgui.so
>  
> +PYTHON_VERS ?= python
> +
>  # Can build python?
> -ifeq ($(shell sh -c "python-config --includes > /dev/null 2>&1 && echo y"), y)
> +ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y)
>  	PYTHON_PLUGINS := plugin_python.so
>  	BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS)
>  	PYTHON_SO_INSTALL := ctracecmd.install
> @@ -550,8 +552,8 @@ clean:
>  
>  ##### PYTHON STUFF #####
>  
> -PYTHON_INCLUDES = `python-config --includes`
> -PYTHON_LDFLAGS = `python-config --ldflags` \
> +PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)`
> +PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \
>  		$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')")
>  PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
>  

Re: [PATCH 1/1] trace-cmd: use pkg-config instead of python-config

[Johannes Berg]

On Fri, 2013-11-01 at 17:19 -0400, Steven Rostedt wrote:
> Please Cc me on trace-cmd patches.
> 
> Johannes and Darren,
> 
> Since you handle the python bindings in trace-cmd, can you give me an
> ack or nack.

Looks fine to me, in that it would work on my system :)

johannes

Re: [PATCH 1/1] trace-cmd: use pkg-config instead of python-config

[Darren Hart]

I'm hardly an expert here, but the appears sane to me. Perhaps a
comment above the PYTHON_VERS describing what valid values are would
be helpful. Otherwise, looks good to me.

On Mon, Nov 4, 2013 at 12:32 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Fri, 2013-11-01 at 17:19 -0400, Steven Rostedt wrote:
>> Please Cc me on trace-cmd patches.
>>
>> Johannes and Darren,
>>
>> Since you handle the python bindings in trace-cmd, can you give me an
>> ack or nack.
>
> Looks fine to me, in that it would work on my system :)
>
> johannes
>



-- 
Darren Hart

Re: [PATCH 1/1] trace-cmd: use pkg-config instead of python-config

[Romain Naour]

Hi,

Le 04/11/2013 23:20, Darren Hart a écrit :
> I'm hardly an expert here, but the appears sane to me. Perhaps a
> comment above the PYTHON_VERS describing what valid values are would
> be helpful. Otherwise, looks good to me.

Expected values are "python" and "python3" for PYTHON_VERS.

trace-cmd has been added in buildroot right after the 2013.08 release,
but several build failures has occurred in autobuilder like this one:
http://autobuild.buildroot.net/results/980/980875810528ac1dee34b8c268d9b3c40b2e35ec/build-end.log

Currently, we have two separate package for python2 and python3 in buildroot,
that's why I use PYTHON_VERS here.

See how trace-cmd.mk use PYTHON_VERS:
http://git.buildroot.net/buildroot/commit/?id=ff0367008c683362f422751644237218b1c45def

Best regards,
Romain Naour

> 
> On Mon, Nov 4, 2013 at 12:32 AM, Johannes Berg
> <johannes@sipsolutions.net> wrote:
>> On Fri, 2013-11-01 at 17:19 -0400, Steven Rostedt wrote:
>>> Please Cc me on trace-cmd patches.
>>>
>>> Johannes and Darren,
>>>
>>> Since you handle the python bindings in trace-cmd, can you give me an
>>> ack or nack.
>>
>> Looks fine to me, in that it would work on my system :)
>>
>> johannes
>>
> 
> 
>