fix build error with gcc10
This commit is contained in:
parent
61b8e79dbf
commit
006677e61e
32
fix-multiple-definition-error-with-gcc10.patch
Normal file
32
fix-multiple-definition-error-with-gcc10.patch
Normal file
@ -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[])
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: wget
|
Name: wget
|
||||||
Version: 1.20.3
|
Version: 1.20.3
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: A package for retrieving files using HTTP, HTTPS, FTP and FTPS the most widely-used Internet protocols.
|
Summary: A package for retrieving files using HTTP, HTTPS, FTP and FTPS the most widely-used Internet protocols.
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Url: http://www.gnu.org/software/wget/
|
Url: http://www.gnu.org/software/wget/
|
||||||
@ -16,6 +16,7 @@ Patch6006: calc_rate-fix-division-by-zero.patch
|
|||||||
Patch6007: print-row-stats-fix-two-integer-overflows.patch
|
Patch6007: print-row-stats-fix-two-integer-overflows.patch
|
||||||
Patch6008: dot-draw-avoid-integer-overflows.patch
|
Patch6008: dot-draw-avoid-integer-overflows.patch
|
||||||
Patch6009: fix-and-cleanup-progress-bar-code.patch
|
Patch6009: fix-and-cleanup-progress-bar-code.patch
|
||||||
|
Patch6010: fix-multiple-definition-error-with-gcc10.patch
|
||||||
|
|
||||||
Patch9000: avoid-triggering-signed-integer-overflow.patch
|
Patch9000: avoid-triggering-signed-integer-overflow.patch
|
||||||
|
|
||||||
@ -66,6 +67,12 @@ make check
|
|||||||
%{_infodir}/*
|
%{_infodir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 30 2021 gaihuiying <gaihuiying1@huawei.com> - 1.20.3-5
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix build error with gcc10
|
||||||
|
|
||||||
* Thu May 27 2021 lijingyuan <lijingyuan3@huawei.com> - 1.20.3-4
|
* Thu May 27 2021 lijingyuan <lijingyuan3@huawei.com> - 1.20.3-4
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user