commit: 94ae3ad228e9bbf5804932da02f665362bd73a9e Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Jun 15 18:25:09 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Jun 15 18:25:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ae3ad2
net-misc/ipv6calc: backport gcc-10 tweak Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/708056 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch | 34 ++++++++++++++++++++++ net-misc/ipv6calc/ipv6calc-2.2.0.ebuild | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch new file mode 100644 index 00000000000..4639fa7406f --- /dev/null +++ b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/708056 + +From 8c7eea58f2034113ae91ff7adc2bda72465b7d1a Mon Sep 17 00:00:00 2001 +From: Peter Bieringer <[email protected]> +Date: Fri, 24 Jan 2020 07:15:55 +0100 +Subject: [PATCH] ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of + 'cache_lru_limit' + +--- a/ipv6logconv/ipv6logconv.c ++++ b/ipv6logconv/ipv6logconv.c +@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype); + /* LRU cache */ + + #define CACHE_LRU_SIZE 200 +- ++int cache_lru_limit; + static int cache_lru_max = 0; + static int cache_lru_last = 0; + static char cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST]; +--- a/ipv6logconv/ipv6logconv.h ++++ b/ipv6logconv/ipv6logconv.h +@@ -20,8 +20,7 @@ + #define DEBUG_ipv6logconv_general 0x00000001l + #define DEBUG_ipv6logconv_processing 0x00000002l + +-/* prototyping */ +-int cache_lru_limit; ++extern int cache_lru_limit; + + extern int feature_reg; + extern int feature_ieee; +-- +2.27.0 + diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild index 65630c1080e..36eb43a1061 100644 --- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild +++ b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,6 +22,8 @@ DEPEND="${RDEPEND} test? ( dev-perl/Digest-SHA1 ) " +PATCHES=("${FILESDIR}"/${P}-gcc-10.patch) + #dev-perl/URI is needed for web interface, that is not installed now src_configure() {
