* [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config
@ 2013-10-13 22:26 Romain Naour
2013-10-14 6:58 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: Romain Naour @ 2013-10-13 22:26 UTC (permalink / raw)
To: buildroot
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/
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
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
diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in
index 8d79304..96ed63a 100644
--- a/package/trace-cmd/Config.in
+++ b/package/trace-cmd/Config.in
@@ -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.
diff --git a/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
b/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
new file mode 100644
index 0000000..a1f8c4b
--- /dev/null
+++ b/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
@@ -0,0 +1,34 @@
+Makefile: use pkg-config instead of python-config
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ 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
+
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index 7a750f9..cd6ba20 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -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
--
1.8.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config
2013-10-13 22:26 [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config Romain Naour
@ 2013-10-14 6:58 ` Thomas Petazzoni
2013-10-14 10:52 ` Peter Korsgaard
2013-10-14 22:39 ` Romain Naour
0 siblings, 2 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2013-10-14 6:58 UTC (permalink / raw)
To: buildroot
Dear Romain Naour,
On Mon, 14 Oct 2013 00:26:54 +0200, Romain Naour wrote:
>
> 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/
>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Interesting, this looks simpler than what I have done.
> ---
> Note: Makefile use swig which is not available in buildroot.
swig is definitely available, in package/swig/.
>
> 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
>
> diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in
> index 8d79304..96ed63a 100644
> --- a/package/trace-cmd/Config.in
> +++ b/package/trace-cmd/Config.in
> @@ -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
else
TRACE_CMD_DEPENDENCIES += python
endif
> + 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.
> diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
> index 7a750f9..cd6ba20 100644
> --- a/package/trace-cmd/trace-cmd.mk
> +++ b/package/trace-cmd/trace-cmd.mk
> @@ -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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config
2013-10-14 6:58 ` Thomas Petazzoni
@ 2013-10-14 10:52 ` Peter Korsgaard
2013-10-14 22:39 ` Romain Naour
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2013-10-14 10:52 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi,
>> +++ b/package/trace-cmd/Config.in
>> @@ -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
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
else
TRACE_CMD_MAKE_FLAGS += -NO_PYTHON=1
endif
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config
2013-10-14 6:58 ` Thomas Petazzoni
2013-10-14 10:52 ` Peter Korsgaard
@ 2013-10-14 22:39 ` Romain Naour
2013-10-15 7:30 ` Thomas Petazzoni
1 sibling, 1 reply; 5+ messages in thread
From: Romain Naour @ 2013-10-14 22:39 UTC (permalink / raw)
To: buildroot
Hi,
Le 14/10/2013 08:58, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
>
> On Mon, 14 Oct 2013 00:26:54 +0200, Romain Naour wrote:
>>
>> 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/
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>
> Interesting, this looks simpler than what I have done.
>
>> ---
>> Note: Makefile use swig which is not available in buildroot.
>
> swig is definitely available, in package/swig/.
Ok, I missed it :/
Thanks.
>
>>
>> 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
>>
>> diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in
>> index 8d79304..96ed63a 100644
>> --- a/package/trace-cmd/Config.in
>> +++ b/package/trace-cmd/Config.in
>> @@ -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
> else
> TRACE_CMD_DEPENDENCIES += python
> endif
What about python3 ?
But python 2.7 seems to be good enough.
>
>> + 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.
>
>> diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
>> index 7a750f9..cd6ba20 100644
>> --- a/package/trace-cmd/trace-cmd.mk
>> +++ b/package/trace-cmd/trace-cmd.mk
>> @@ -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.
host-pkgconf ?
>
> 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
> Best regards,
>
> Thomas
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config
2013-10-14 22:39 ` Romain Naour
@ 2013-10-15 7:30 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2013-10-15 7:30 UTC (permalink / raw)
To: buildroot
Dear Romain Naour,
On Tue, 15 Oct 2013 00:39:31 +0200, Romain Naour wrote:
> > 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
> > else
> > TRACE_CMD_DEPENDENCIES += python
> > endif
>
> What about python3 ?
> But python 2.7 seems to be good enough.
Enabling it against Python3 would be good indeed.
> > 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.
> > 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-15 7:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-13 22:26 [Buildroot] [PATCH 1/1] trace-cmd: use pkg-config instead of python-config Romain Naour
2013-10-14 6:58 ` Thomas Petazzoni
2013-10-14 10:52 ` Peter Korsgaard
2013-10-14 22:39 ` Romain Naour
2013-10-15 7:30 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox