diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/strace/4.19/0000-conflicting-decl.patch | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/strace/4.19/0000-conflicting-decl.patch')
-rw-r--r-- | packages/strace/4.19/0000-conflicting-decl.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/packages/strace/4.19/0000-conflicting-decl.patch b/packages/strace/4.19/0000-conflicting-decl.patch new file mode 100644 index 0000000..92427e1 --- /dev/null +++ b/packages/strace/4.19/0000-conflicting-decl.patch @@ -0,0 +1,36 @@ +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]. + +--- + error_prints.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- 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) |