blob: c1580418dc1842aabad036712163b5bca6e1db0a [file] [log] [blame]
Andrew Geisslerc182c622020-05-15 14:13:32 -05001From f993697af81c37df9c55e0ebedeb1b8b880506ae Mon Sep 17 00:00:00 2001
2From: Richard Leitner <richard.leitner@skidata.com>
3Date: Tue, 5 May 2020 11:59:42 +0200
4Subject: [PATCH] gdbm: fix link failure against gcc-10
5
6Copied from gentoo's solution at https://bugs.gentoo.org/show_bug.cgi?id=705898
7Original patch by Sergei Trofimovich <slyfox@gentoo.org>
8
9Original description:
10
11Before the change on gcc-10 link failed as:
12```
13 CCLD gdbmtool
14ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args';
15 gdbmtool.o:(.data.rel.local+0x260): first defined here
16ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc';
17 gdbmtool.o:(.data.rel.local+0x268): first defined here
18```
19
20gcc-10 will change the default from -fcommon to fno-common:
21 https://gcc.gnu.org/PR85678.
22
23The fix is to avoid multiple definition and rely on
24declarations only.
25
26Upstream-Status: Pending
27Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
28---
29 src/parseopt.c | 2 --
30 1 file changed, 2 deletions(-)
31
32diff --git a/src/parseopt.c b/src/parseopt.c
33index 268e080..a4c8576 100644
34--- a/src/parseopt.c
35+++ b/src/parseopt.c
36@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin)
37 }
38
39 char *parseopt_program_name;
40-char *parseopt_program_doc;
41-char *parseopt_program_args;
42 const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
43 void (*parseopt_help_hook) (FILE *stream);
44
45--
462.26.2
47