Skip to contentSkip to conversation

strace: fix program_invocation_name uClibc declaration mismatch

PATCH New Baruch Siach 2 participants 4 messages Sep 8, 2017 – Sep 9, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 strace: fix program_invocation_name uClibc declaration mismatch

The local program_invocation_name declaration conflicts with the uClibc one. Add a patch making this declaration depend on !HAVE_PROGRAM_INVOCATION_NAME.

Fixes:
http://autobuild.buildroot.net/results/5f0/5f0852f3ffb46f8fb2b4c9318652c5ab3ab5e97d/

Signed-off-by Baruch Siach <[email protected]>
---
 ...s-fix-program_invocation_name-type-confli.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/strace/0001-error_prints-fix-program_invocation_name-type-confli.patch
package/strace/0001-error_prints-fix-program_invocation_name-type-confli.patch new file +45 -0
new file mode 100644
index 000000000000..b144bdd78c50
@@ -0,0 +1,45 @@
+From 96ad51b91c6ab7ff8bac58f90f199324baed07af Mon Sep 17 00:00:00 2001
+From: Baruch Siach <[email protected]>
+Date: Fri, 8 Sep 2017 12:08:13 +0300
+Subject: [PATCH] error_prints: fix program_invocation_name type conflict
+
+uClibc-ng declares program_invocation_name as const. This causes the
+build failure below:
+
+error_prints.c:40:14: error: conflicting types for ?program_invocation_name?
+ extern char *program_invocation_name;
+              ^~~~~~~~~~~~~~~~~~~~~~~
+In file included from error_prints.c:32:0:
+.../output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/errno.h:54:20: note: previous declaration of ?program_invocation_name? was here
+ extern const char *program_invocation_name, *program_invocation_short_name;
+                    ^~~~~~~~~~~~~~~~~~~~~~~
+Makefile:3856: recipe for target 'strace-error_prints.o' failed
+
+Declare program_invocation_name only when the C library does not provide
+one.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: sent upstream; waiting for moderator approval to appear at
+https://sourceforge.net/p/strace/mailman/strace-devel/.
+
+ error_prints.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/error_prints.c b/error_prints.c
+index 8519b9246698..710e99b04ab9 100644
+--- a/error_prints.c
++++ b/error_prints.c
+@@ -37,7 +37,9 @@
+ 
+ #include "error_prints.h"
+ 
++#ifndef HAVE_PROGRAM_INVOCATION_NAME
+ extern char *program_invocation_name;
++#endif
+ 
+ static void
+ verror_msg(int err_no, const char *fmt, va_list p)
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/2 strace: update homepage link

strace moved to a new homepage as upstream commit 2bba131575878 (Update homepage URL) indicates.

Signed-off-by Baruch Siach <[email protected]>
---
 package/strace/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/strace/Config.in +1 -1
index 501c9646d6f0..b84b3fd179ea 100644
@@ -7,7 +7,7 @@ config BR2_PACKAGE_STRACE
 	  Allows you to track what system calls a program makes
 	  while it is running.
 
-	  http://sourceforge.net/projects/strace/
+	  https://strace.io
 
 comment "strace needs a toolchain w/ headers >= 4.0 on nios2"
 	depends on BR2_nios2
Signature · 1 line
2.14.1
Applied
#2 lore raw

PATCH 2/2 strace: update homepage link

Hello,

Quoted 7 lines · Baruch Siach

strace moved to a new homepage as upstream commit 2bba131575878 (Update homepage URL) indicates.

Signed-off-by Baruch Siach <[email protected]>
---
 package/strace/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#3 lore raw

PATCH 1/2 strace: fix program_invocation_name uClibc declaration mismatch

In reply to Baruch Siach

Hello,

Quoted 4 lines · Baruch Siach

The local program_invocation_name declaration conflicts with the uClibc one. Add a patch making this declaration depend on !HAVE_PROGRAM_INVOCATION_NAME.

Quoted 8 lines

Fixes:
http://autobuild.buildroot.net/results/5f0/5f0852f3ffb46f8fb2b4c9318652c5ab3ab5e97d/

Signed-off-by Baruch Siach <[email protected]>
---
 ...s-fix-program_invocation_name-type-confli.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/strace/0001-error_prints-fix-program_invocation_name-type-confli.patch

Applied to master, thanks. I've updated the upstream status in the patch, since it has been merged upstream. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com