Fix FTBFS with new gcc (#1800250)

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2020-02-25 17:34:10 +01:00
parent 6b4c8e6ebe
commit 23bbfe5beb
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001
From: Tim Rühsen <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 5fae8a2..f66e5e6 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[])
--
libgit2 0.28.2

View File

@ -1,13 +1,15 @@
Summary: A utility for retrieving files using the HTTP or FTP protocols
Name: wget
Version: 1.20.3
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+
Url: http://www.gnu.org/software/wget/
Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz
Patch1: wget-1.17-path.patch
Patch2: wget-1.20.3-remove-unneeded-debug-lines.patch
# http://git.savannah.gnu.org/cgit/wget.git/commit/?id=04b7369490344d014b05dee5d48ca78cd04733ce
Patch3: wget-1.20.3-Fix-multiple-definition-of-with-gcc-10.patch
Provides: webclient
Provides: bundled(gnulib)
@ -66,6 +68,9 @@ make check
%{_infodir}/*
%changelog
* Tue Feb 25 2020 Tomas Hozza <thozza@redhat.com> - 1.20.3-4
- Fix FTBFS with new gcc (#1800250)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild