1 |
commit: 285b5666060df4ae4d66af4ae9623aa8009f27cb |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 2 18:08:31 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 2 18:10:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285b5666 |
7 |
|
8 |
net-misc/wget: fix building with gcc-10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706458 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
.../wget/files/wget-1.20.3-gcc10-fno-common.patch | 32 ++++++++++++++++++++++ |
15 |
net-misc/wget/wget-1.20.3-r3.ebuild | 2 ++ |
16 |
2 files changed, 34 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..3b99f4071af |
21 |
--- /dev/null |
22 |
+++ b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch |
23 |
@@ -0,0 +1,32 @@ |
24 |
+From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001 |
25 |
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@×××.de> |
26 |
+Date: Sat, 22 Feb 2020 13:40:50 +0100 |
27 |
+Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with |
28 |
+ gcc 10 |
29 |
+ |
30 |
+--- |
31 |
+ tests/unit-tests.c | 4 ++-- |
32 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
33 |
+ |
34 |
+diff --git a/tests/unit-tests.c b/tests/unit-tests.c |
35 |
+index 5fae8a219..f66e5e664 100644 |
36 |
+--- a/tests/unit-tests.c |
37 |
++++ b/tests/unit-tests.c |
38 |
+@@ -37,7 +37,7 @@ as that of the covered work. */ |
39 |
+ |
40 |
+ #include "unit-tests.h" |
41 |
+ |
42 |
+-const char *program_argstring = "TEST"; |
43 |
++extern const char *program_argstring; |
44 |
+ |
45 |
+ static int tests_run; |
46 |
+ |
47 |
+@@ -69,7 +69,7 @@ all_tests(void) |
48 |
+ return NULL; |
49 |
+ } |
50 |
+ |
51 |
+-const char *program_name; /* Needed by lib/error.c. */ |
52 |
++extern const char *program_name; /* Needed by lib/error.c. */ |
53 |
+ |
54 |
+ int |
55 |
+ main (int argc _GL_UNUSED, const char *argv[]) |
56 |
|
57 |
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild |
58 |
index dc1e481def7..cc2ca822468 100644 |
59 |
--- a/net-misc/wget/wget-1.20.3-r3.ebuild |
60 |
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild |
61 |
@@ -54,6 +54,8 @@ BDEPEND=" |
62 |
|
63 |
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) |
64 |
|
65 |
+PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch ) |
66 |
+ |
67 |
pkg_setup() { |
68 |
use test && python-any-r1_pkg_setup |
69 |
} |