diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-09-30 23:01:52 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-09-30 23:01:52 (GMT) |
| commit | 4c321260b2a144bf143d44bb1e1c01238bdc2a9e (patch) | |
| tree | e129b3fd6ab65abaa9461b91c44dd145db5b48fc /packages/strace | |
| parent | 529e429c6e770a377d8ab642a7e3768afeca64d1 (diff) | |
Strace 4.19 needs a patch for uClibc
Taken from upstream.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/strace')
| -rw-r--r-- | packages/strace/4.19/100-conflicting-decl.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/strace/4.19/100-conflicting-decl.patch b/packages/strace/4.19/100-conflicting-decl.patch new file mode 100644 index 0000000..992eac8 --- /dev/null +++ b/packages/strace/4.19/100-conflicting-decl.patch @@ -0,0 +1,34 @@ +commit d45f27147f7d95eb209463dc03dc039ea3f15b59 +Author: Baruch Siach <baruch@tkos.co.il> +Date: Fri Sep 8 12:12:57 2017 +0300 + + error_prints: fix potential 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; + ^~~~~~~~~~~~~~~~~~~~~~~ + + * error_prints.c (program_invocation_name): Declare only in case + of [!HAVE_PROGRAM_INVOCATION_NAME]. + +diff --git a/error_prints.c b/error_prints.c +index 8519b924..710e99b0 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) |