From: Baruch Siach <baruch@tkos.co.il>
Date: Fri, 8 Sep 2017 09:23:48 +0000 (+0300)
Subject: strace: fix program_invocation_name uClibc declaration mismatch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c374641e31040e77355cf63de30b6984e91114f1;p=buildroot.git

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 <baruch@tkos.co.il>
[Thomas: update patch status.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/strace/0001-error_prints-fix-program_invocation_name-type-confli.patch b/package/strace/0001-error_prints-fix-program_invocation_name-type-confli.patch
new file mode 100644
index 0000000000..9c982f3cce
--- /dev/null
+++ b/package/strace/0001-error_prints-fix-program_invocation_name-type-confli.patch
@@ -0,0 +1,45 @@
+From 96ad51b91c6ab7ff8bac58f90f199324baed07af Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+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 <baruch@tkos.co.il>
+---
+Upstream status: merged,
+https://github.com/strace/strace/commit/d45f27147f7d95eb209463dc03dc039ea3f15b59
+
+ 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
+