diff options
author | zhengruoqin <zhengrq.fnst@cn.fujitsu.com> | 2021-01-05 15:38:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-08 10:10:15 +0000 |
commit | cdf2be3746ce54141a761bda6fdc9ae9c44d5964 (patch) | |
tree | 27b0884a28b66652a7923966539b387110dfd992 /meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch | |
parent | 52dcec880fbf8156f88ffc1793875af28ac758c1 (diff) | |
download | poky-cdf2be3746ce54141a761bda6fdc9ae9c44d5964.tar.gz |
gdbm: upgrade 1.18.1 -> 1.19
gdbm-fix-link-failure-against-gcc-10.patch
Removed since this is included in 1.19
(From OE-Core rev: d96bb907652bd83abc1386555a93678dd64ced4f)
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch')
-rw-r--r-- | meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch b/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch deleted file mode 100644 index c1580418dc..0000000000 --- a/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From f993697af81c37df9c55e0ebedeb1b8b880506ae Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Leitner <richard.leitner@skidata.com> | ||
3 | Date: Tue, 5 May 2020 11:59:42 +0200 | ||
4 | Subject: [PATCH] gdbm: fix link failure against gcc-10 | ||
5 | |||
6 | Copied from gentoo's solution at https://bugs.gentoo.org/show_bug.cgi?id=705898 | ||
7 | Original patch by Sergei Trofimovich <slyfox@gentoo.org> | ||
8 | |||
9 | Original description: | ||
10 | |||
11 | Before the change on gcc-10 link failed as: | ||
12 | ``` | ||
13 | CCLD gdbmtool | ||
14 | ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args'; | ||
15 | gdbmtool.o:(.data.rel.local+0x260): first defined here | ||
16 | ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc'; | ||
17 | gdbmtool.o:(.data.rel.local+0x268): first defined here | ||
18 | ``` | ||
19 | |||
20 | gcc-10 will change the default from -fcommon to fno-common: | ||
21 | https://gcc.gnu.org/PR85678. | ||
22 | |||
23 | The fix is to avoid multiple definition and rely on | ||
24 | declarations only. | ||
25 | |||
26 | Upstream-Status: Pending | ||
27 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
28 | --- | ||
29 | src/parseopt.c | 2 -- | ||
30 | 1 file changed, 2 deletions(-) | ||
31 | |||
32 | diff --git a/src/parseopt.c b/src/parseopt.c | ||
33 | index 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 | -- | ||
46 | 2.26.2 | ||
47 | |||