[Buildroot] [PATCH 1/2] package/trace-cmd: update download url

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/2] package/trace-cmd: update download url
@ 2014-06-05 22:07 Romain Naour
  2014-06-05 22:07 ` [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2 Romain Naour
  2014-06-08 13:21 ` [Buildroot] [PATCH 1/2] package/trace-cmd: update download url Thomas Petazzoni
  0 siblings, 2 replies; 5+ messages in thread
From: Romain Naour @ 2014-06-05 22:07 UTC (permalink / raw)
  To: buildroot

The git repository has been moved to http://www.kernel.org/pub/ which allows to use $(BR2_KERNEL_MIRROR)

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/trace-cmd/trace-cmd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index 6a732db..9a1ba71 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 TRACE_CMD_VERSION = trace-cmd-v2.2.1
-TRACE_CMD_SITE = http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
+TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git
 TRACE_CMD_SITE_METHOD = git
 TRACE_CMD_INSTALL_STAGING = YES
 TRACE_CMD_LICENSE = GPLv2 LGPLv2.1
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2
  2014-06-05 22:07 [Buildroot] [PATCH 1/2] package/trace-cmd: update download url Romain Naour
@ 2014-06-05 22:07 ` Romain Naour
  2014-06-08 13:22   ` Thomas Petazzoni
  2014-06-08 13:21 ` [Buildroot] [PATCH 1/2] package/trace-cmd: update download url Thomas Petazzoni
  1 sibling, 1 reply; 5+ messages in thread
From: Romain Naour @ 2014-06-05 22:07 UTC (permalink / raw)
  To: buildroot

The first patch "use-pkg-config-instead-of-python-config" has been applied upstream.

The flag _GNU_SOURCE is now always defined in Makefile, so it can be removed from trace-cmd.mk

CPPFLAGS are appended to CFLAGS and are used to add extra flags, but the flag _LARGEFILE64_SOURCE
in TARGET_CPPFLAGS is already defined in source files, which causes a build error.
CPPFLAGS are cleared before passing them to the trace-cmd Makefile.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 .../trace-cmd-0001-Fix-ptrace-detection.patch      | 36 ++++++++++++++++++
 ...e-use-pkg-config-instead-of-python-config.patch | 43 ----------------------
 .../trace-cmd-0002-Fix-ptrace-detection.patch      | 36 ------------------
 package/trace-cmd/trace-cmd.mk                     | 10 ++++-
 4 files changed, 44 insertions(+), 81 deletions(-)
 create mode 100644 package/trace-cmd/trace-cmd-0001-Fix-ptrace-detection.patch
 delete mode 100644 package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
 delete mode 100644 package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch

diff --git a/package/trace-cmd/trace-cmd-0001-Fix-ptrace-detection.patch b/package/trace-cmd/trace-cmd-0001-Fix-ptrace-detection.patch
new file mode 100644
index 0000000..b17d7df
--- /dev/null
+++ b/package/trace-cmd/trace-cmd-0001-Fix-ptrace-detection.patch
@@ -0,0 +1,36 @@
+From 0070081ffe65a4fbe442044ddfcc818593c98e33 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Wed, 30 Oct 2013 22:35:34 +0100
+Subject: [PATCH] Fix ptrace detection
+
+Ptrace support detection is ignored when CFLAGS is set in command
+arguments. Use override in Makefile to add -DWARN_NO_PTRACE and
+-DNO_PTRACE in CFLAGS if ptrace is not available.
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 83329ca..01b4f45 100644
+--- a/Makefile
++++ b/Makefile
+@@ -223,12 +223,12 @@ LDFLAGS ?=
+ ifndef NO_PTRACE
+ ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
+ 	NO_PTRACE = 1
+-	CFLAGS += -DWARN_NO_PTRACE
++	override CFLAGS += -DWARN_NO_PTRACE
+ endif
+ endif
+ 
+ ifdef NO_PTRACE
+-CFLAGS += -DNO_PTRACE
++override CFLAGS += -DNO_PTRACE
+ endif
+ 
+ # Append required CFLAGS
+-- 
+1.8.1.2
+
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
deleted file mode 100644
index 6fed42c..0000000
--- a/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-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 83329ca..23b70d8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -80,8 +80,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
-@@ -546,8 +548,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.4
-
diff --git a/package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch b/package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch
deleted file mode 100644
index b17d7df..0000000
--- a/package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0070081ffe65a4fbe442044ddfcc818593c98e33 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Wed, 30 Oct 2013 22:35:34 +0100
-Subject: [PATCH] Fix ptrace detection
-
-Ptrace support detection is ignored when CFLAGS is set in command
-arguments. Use override in Makefile to add -DWARN_NO_PTRACE and
--DNO_PTRACE in CFLAGS if ptrace is not available.
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 83329ca..01b4f45 100644
---- a/Makefile
-+++ b/Makefile
-@@ -223,12 +223,12 @@ LDFLAGS ?=
- ifndef NO_PTRACE
- ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
- 	NO_PTRACE = 1
--	CFLAGS += -DWARN_NO_PTRACE
-+	override CFLAGS += -DWARN_NO_PTRACE
- endif
- endif
- 
- ifdef NO_PTRACE
--CFLAGS += -DNO_PTRACE
-+override CFLAGS += -DNO_PTRACE
- endif
- 
- # Append required CFLAGS
--- 
-1.8.1.2
-
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index 9a1ba71..b58637d 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TRACE_CMD_VERSION = trace-cmd-v2.2.1
+TRACE_CMD_VERSION = trace-cmd-v2.3.2
 TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git
 TRACE_CMD_SITE_METHOD = git
 TRACE_CMD_INSTALL_STAGING = YES
@@ -25,11 +25,17 @@ endif
 
 # 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
+TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
+
+# trace-cmd use CPPFLAGS to add some extra flags.
+# But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE
+# that causes build problems.
+TRACE_CMD_CPPFLAGS = ""
 
 define TRACE_CMD_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TRACE_CMD_CFLAGS)" \
+		CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
 		$(TRACE_CMD_MAKE_OPTS) \
 		-C $(@D) all
 endef
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2
  2014-06-05 22:07 ` [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2 Romain Naour
@ 2014-06-08 13:22   ` Thomas Petazzoni
  2014-06-08 16:40     ` Romain Naour
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2014-06-08 13:22 UTC (permalink / raw)
  To: buildroot

Dear Romain Naour,

On Fri,  6 Jun 2014 00:07:18 +0200, Romain Naour wrote:
> The first patch "use-pkg-config-instead-of-python-config" has been applied upstream.
> 
> The flag _GNU_SOURCE is now always defined in Makefile, so it can be removed from trace-cmd.mk
> 
> CPPFLAGS are appended to CFLAGS and are used to add extra flags, but the flag _LARGEFILE64_SOURCE
> in TARGET_CPPFLAGS is already defined in source files, which causes a build error.
> CPPFLAGS are cleared before passing them to the trace-cmd Makefile.

Please wrap your commit message properly.

>  # 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
> +TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
> +
> +# trace-cmd use CPPFLAGS to add some extra flags.
> +# But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE
> +# that causes build problems.
> +TRACE_CMD_CPPFLAGS = ""

And therefore why don't you use the same strategy as the one used for
CFLAGS, by filtering out the -D_LARGEFILE64_SOURCE ?

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

* [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2
  2014-06-08 13:22   ` Thomas Petazzoni
@ 2014-06-08 16:40     ` Romain Naour
  0 siblings, 0 replies; 5+ messages in thread
From: Romain Naour @ 2014-06-08 16:40 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 08/06/2014 15:22, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
> 
> On Fri,  6 Jun 2014 00:07:18 +0200, Romain Naour wrote:
>> The first patch "use-pkg-config-instead-of-python-config" has been applied upstream.
>>
>> The flag _GNU_SOURCE is now always defined in Makefile, so it can be removed from trace-cmd.mk
>>
>> CPPFLAGS are appended to CFLAGS and are used to add extra flags, but the flag _LARGEFILE64_SOURCE
>> in TARGET_CPPFLAGS is already defined in source files, which causes a build error.
>> CPPFLAGS are cleared before passing them to the trace-cmd Makefile.
> 
> Please wrap your commit message properly.

Sure, sorry for that :-/

> 
>>  # 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
>> +TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
>> +
>> +# trace-cmd use CPPFLAGS to add some extra flags.
>> +# But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE
>> +# that causes build problems.
>> +TRACE_CMD_CPPFLAGS = ""
> 
> And therefore why don't you use the same strategy as the one used for
> CFLAGS, by filtering out the -D_LARGEFILE64_SOURCE ?

That's what I did at first, but I wasn't sure since CPPFLAGS and CFLAGS add the
same set of flags.

Ok, I will send a v2 with that fixed.

Best regards,
Romain

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/2] package/trace-cmd: update download url
  2014-06-05 22:07 [Buildroot] [PATCH 1/2] package/trace-cmd: update download url Romain Naour
  2014-06-05 22:07 ` [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2 Romain Naour
@ 2014-06-08 13:21 ` Thomas Petazzoni
  1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2014-06-08 13:21 UTC (permalink / raw)
  To: buildroot

Dear Romain Naour,

On Fri,  6 Jun 2014 00:07:17 +0200, Romain Naour wrote:
> The git repository has been moved to http://www.kernel.org/pub/ which allows to use $(BR2_KERNEL_MIRROR)

Next time, please wrap your commit messages properly.

Patch applied, 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:[~2014-06-08 16:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-05 22:07 [Buildroot] [PATCH 1/2] package/trace-cmd: update download url Romain Naour
2014-06-05 22:07 ` [Buildroot] [PATCH 2/2] package/trace-cmd: bump to version 2.3.2 Romain Naour
2014-06-08 13:22   ` Thomas Petazzoni
2014-06-08 16:40     ` Romain Naour
2014-06-08 13:21 ` [Buildroot] [PATCH 1/2] package/trace-cmd: update download url Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.