trace-cmd: use pkg-config instead of python-config
PATCH 1/1 trace-cmd: use pkg-config instead of python-config
Add missing python dependency.Makefile use host's python-config, which seems breaks powerpc and arm build. Replaces python-config with pkg-config.
Add pkg-config as dependency.
Fixes:
http://autobuild.buildroot.net/results/980/980875810528ac1dee34b8c268d9b3c40b2e35ec/
---
Note: Makefile use swig which is not available in buildroot.
package/trace-cmd/Config.in | 2 ++ ...e-use-pkg-config-instead-of-python-config.patch | 34 ++++++++++++++++++++++ package/trace-cmd/trace-cmd.mk | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
package/trace-cmd/Config.in +2 -0
@@ -2,6 +2,8 @@ config BR2_PACKAGE_TRACE_CMD bool "trace-cmd" depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PKG_CONFIG help Command line reader for ftrace.
(quoted diff) +0 -0
b/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch new file mode 100644
index 0000000..a1f8c4b
package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch new file +34 -0
@@ -0,0 +1,34 @@ +Makefile: use pkg-config instead of python-config + +Signed-off-by: Romain Naour <[email protected]> +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 83329ca..5605fbf 100644 +--- a/Makefile ++++ b/Makefile +@@ -81,7 +81,7 @@ PYTHON := ctracecmd.so + PYTHON_GUI := ctracecmd.so ctracecmdgui.so + + # 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 > /dev/null 2>&1 && echo y"), y) + PYTHON_PLUGINS := plugin_python.so + BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS) + PYTHON_SO_INSTALL := ctracecmd.install +@@ -546,8 +546,8 @@ clean: + + ##### PYTHON STUFF ##### + +-PYTHON_INCLUDES = `python-config --includes` +-PYTHON_LDFLAGS = `python-config --ldflags` \ ++PYTHON_INCLUDES = `pkg-config --cflags python` ++PYTHON_LDFLAGS = `pkg-config --libs python` \ + $(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')") + PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0` + +-- +1.8.4 +
package/trace-cmd/trace-cmd.mk +2 -0
@@ -11,6 +11,8 @@ TRACE_CMD_INSTALL_STAGING = YES TRACE_CMD_LICENSE = GPLv2 LGPLv2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB +TRACE_CMD_DEPENDENCIES = python pkg-config + # trace-cmd already defines _LARGEFILE64_SOURCE when necessary, # redefining it on the command line causes build problems. TRACE_CMD_CFLAGS=$(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) -D_GNU_SOURCE
Signature · 1 line
1.8.4
PATCH 1/1 trace-cmd: use pkg-config instead of python-config
Dear Romain Naour,
Quoted 10 lines · Romain Naour
Add missing python dependency.
Makefileuse host's python-config, which seems breaks powerpc and arm build. Replaces python-config with pkg-config.
Add pkg-config as dependency.Fixes:
http://autobuild.buildroot.net/results/980/980875810528ac1dee34b8c268d9b3c40b2e35ec/Signed-off-by Romain Naour <[email protected]>
Interesting, this looks simpler than what I have done.
Quoted 2 lines
---
Note:Makefileuse swig which is not available in buildroot.
swig is definitely available, in package/swig/.
Quoted 12 lines
package/trace-cmd/Config.in | 2 ++ ...e-use-pkg-config-instead-of-python-config.patch | 34 ++++++++++++++++++++++ package/trace-cmd/trace-cmd.mk | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patchpackage/trace-cmd/Config.in +0
-0
package/trace-cmd/Config.in config BR2_PACKAGE_TRACE_CMD · line 5
Quoted 4 lines
package/trace-cmd/Config.in +1
-0@@ -2,6 +2,8 @@ config BR2_PACKAGE_TRACE_CMD bool "trace-cmd" depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_PYTHON
No, Python support is optional in trace-cmd. We should keep optional, by doing:
ifeq ($(BR2_PACKAGE_PYTHON),)TRACE_CMD_MAKE_FLAGS += -NO_PYTHON=1
elseTRACE_CMD_DEPENDENCIES += python
endif
package/trace-cmd/Config.in config BR2_PACKAGE_TRACE_CMD · line 6
Quoted 1 line
package/trace-cmd/Config.in +1
-0+ select BR2_PACKAGE_PKG_CONFIG
No, this is wrong. The pkg-config you're using is not the target pkg-config, but the host pkg-config. There is no need to add a Config.in dependency for that.
package/trace-cmd/trace-cmd.mk TRACE_CMD_INSTALL_STAGING = YES · line 14
Quoted 9 lines
package/trace-cmd/trace-cmd.mk +1
-0@@ -11,6 +11,8 @@ TRACE_CMD_INSTALL_STAGING = YES TRACE_CMD_LICENSE = GPLv2 LGPLv2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB +TRACE_CMD_DEPENDENCIES = python pkg-config
Python dependency should be optional. The pkg-config dependency should be on host-pkg-config.
See also the patch set I had posted to fix the same issue (in a different way, which required changing python2 and python3 config scripts):
http://patchwork.ozlabs.org/patch/279267/
http://patchwork.ozlabs.org/patch/279265/
http://patchwork.ozlabs.org/patch/279269/
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 trace-cmd: use pkg-config instead of python-config
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hi,
Quoted 6 lines
package/trace-cmd/Config.in config BR2_PACKAGE_TRACE_CMD · line 5
Quoted 6 lines
+++ b/package/trace-cmd/Config.in
(quoted diff) +0
-0@@ -2,6 +2,8 @@ config BR2_PACKAGE_TRACE_CMDbool "trace-cmd"
depends onBR2_LARGEFILE
depends onBR2_TOOLCHAIN_HAS_THREADSpackage/trace-cmd/Config.in +1
-0+ select BR2_PACKAGE_PYTHON
Thomas> No, Python support is optional in trace-cmd. We should keep optional, Thomas> by doing:
Thomas> ifeq ($(BR2_PACKAGE_PYTHON),)
Thomas> TRACE_CMD_MAKE_FLAGS += -NO_PYTHON=1
Thomas> else
Thomas> TRACE_CMD_DEPENDENCIES += python
Thomas> endif
Actually I prefer positive logic, E.G.:
ifeq ($(BR2_PACKAGE_PYTHON),y)TRACE_CMD_DEPENDENCIES += python
elseTRACE_CMD_MAKE_FLAGS += -NO_PYTHON=1
endif
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 trace-cmd: use pkg-config instead of python-config
In reply to Thomas PetazzoniHi,
Le 14/10/2013 08:58, Thomas Petazzoni a ?crit :
Quoted 12 lines
Dear Romain Naour,
Quoted 9 lines · Romain Naour
Add missing python dependency.
Makefileuse host's python-config, which seems breaks powerpc and arm build. Replaces python-config with pkg-config.
Add pkg-config as dependency.Fixes:
http://autobuild.buildroot.net/results/980/980875810528ac1dee34b8c268d9b3c40b2e35ec/
Quoted 8 lines
Quoted 1 line
Signed-off-by Romain Naour <[email protected]>Interesting, this looks simpler than what I have done.
Quoted 2 lines
---
Note:Makefileuse swig which is not available in buildroot.swig is definitely available, in package/swig/.
Ok, I missed it :/
Thanks.
Quoted 21 lines
Quoted 13 lines
package/trace-cmd/Config.in | 2 ++ ...e-use-pkg-config-instead-of-python-config.patch | 34 ++++++++++++++++++++++ package/trace-cmd/trace-cmd.mk | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patchpackage/trace-cmd/Config.in +0
-0package/trace-cmd/Config.in config BR2_PACKAGE_TRACE_CMD · line 5
Quoted 4 lines
package/trace-cmd/Config.in +1
-0@@ -2,6 +2,8 @@ config BR2_PACKAGE_TRACE_CMD bool "trace-cmd" depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_PYTHONNo, Python support is optional in trace-cmd. We should keep optional, by doing:
Quoted 5 lines
ifeq ($(BR2_PACKAGE_PYTHON),)
TRACE_CMD_MAKE_FLAGS+= -NO_PYTHON=1
elseTRACE_CMD_DEPENDENCIES+= python
endif
What about python3 ?
But python 2.7 seems to be good enough.
Quoted 15 lines
package/trace-cmd/Config.in config BR2_PACKAGE_TRACE_CMD · line 6
Quoted 2 lines
package/trace-cmd/Config.in +1
-0+ select BR2_PACKAGE_PKG_CONFIGNo, this is wrong. The pkg-config you're using is not the target pkg-config, but the host pkg-config. There is no need to add a Config.in dependency for that.
Quoted 8 lines
package/trace-cmd/trace-cmd.mk +0
-0@@ -11,6 +11,8 @@ TRACE_CMD_INSTALL_STAGING = YES TRACE_CMD_LICENSE = GPLv2 LGPLv2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
Quoted 4 lines
package/trace-cmd/trace-cmd.mk TRACE_CMD_INSTALL_STAGING = YES · line 14
Quoted 1 line
package/trace-cmd/trace-cmd.mk +1
-0+TRACE_CMD_DEPENDENCIES = python pkg-configPython dependency should be optional. The pkg-config dependency should be on host-pkg-config.
host-pkgconf ?
Quoted 9 lines
See also the patch set I had posted to fix the same issue (in a different way, which required changing python2 and python3 config scripts):
http://patchwork.ozlabs.org/patch/279267/
http://patchwork.ozlabs.org/patch/279265/
http://patchwork.ozlabs.org/patch/279269/
I see that, my patch is a workaround and don't fix the real problem. But we can decide to not use python-config for cross-compilation.
May I reuse your patch comments for v2 ?
Thanks for your support.
Best regards,
Romain
Quoted 4 lines
Best regards,
Thomas
PATCH 1/1 trace-cmd: use pkg-config instead of python-config
Dear Romain Naour,
Quoted 11 lines · Romain Naour
Quoted 8 lines
No, Python support is optional in trace-cmd. We should keep optional, by doing:
ifeq ($(BR2_PACKAGE_PYTHON),)
TRACE_CMD_MAKE_FLAGS+= -NO_PYTHON=1
elseTRACE_CMD_DEPENDENCIES+= python
endifWhat about python3 ?
But python 2.7 seems to be good enough.
Enabling it against Python3 would be good indeed.
Quoted 4 lines
Quoted 2 lines
Python dependency should be optional. The pkg-config dependency should be on host-pkg-config.
host-pkgconf ?
Correct, my bad. It used to be host-pkg-config a while ago, and since the binary name is still pkg-config, I've never managed to remember the package name is now pkgconf.
Quoted 9 lines
Quoted 4 lines
http://patchwork.ozlabs.org/patch/279267/
http://patchwork.ozlabs.org/patch/279265/
http://patchwork.ozlabs.org/patch/279269/I see that, my patch is a workaround and don't fix the real problem. But we can decide to not use python-config for cross-compilation.
May I reuse your patch comments for v2 ?
Of course, please do.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com