[gentoo-commits] repo/gentoo:master commit in: net-misc/wget/files/, net-misc/wget/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     285b5666060df4ae4d66af4ae9623aa8009f27cb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May  2 18:08:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May  2 18:10:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285b5666

net-misc/wget: fix building with gcc-10

Closes: https://bugs.gentoo.org/706458
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../wget/files/wget-1.20.3-gcc10-fno-common.patch  | 32 ++++++++++++++++++++++
 net-misc/wget/wget-1.20.3-r3.ebuild                |  2 ++
 2 files changed, 34 insertions(+)

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
new file mode 100644
index 00000000000..3b99f4071af
--- /dev/null
+++ b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch
@@ -0,0 +1,32 @@
+From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sat, 22 Feb 2020 13:40:50 +0100
+Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with
+ gcc 10
+
+---
+ tests/unit-tests.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unit-tests.c b/tests/unit-tests.c
+index 5fae8a219..f66e5e664 100644
+--- a/tests/unit-tests.c
++++ b/tests/unit-tests.c
+@@ -37,7 +37,7 @@ as that of the covered work.  */
+ 
+ #include "unit-tests.h"
+ 
+-const char *program_argstring = "TEST";
++extern const char *program_argstring;
+ 
+ static int tests_run;
+ 
+@@ -69,7 +69,7 @@ all_tests(void)
+   return NULL;
+ }
+ 
+-const char *program_name; /* Needed by lib/error.c. */
++extern const char *program_name; /* Needed by lib/error.c. */
+ 
+ int
+ main (int argc _GL_UNUSED, const char *argv[])

diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index dc1e481def7..cc2ca822468 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -54,6 +54,8 @@ BDEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
+PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }