commit: c00abe05e686dff46288a9ae7c887d92b93c3cef Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Thu Nov 26 15:10:25 2020 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Thu Nov 26 15:13:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00abe05
www-servers/gatling: Fix compile for GCC 10 Closes: https://bugs.gentoo.org/706396 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-3.0.0, Repoman-2.3.23 www-servers/gatling/files/gatling-0.15-gcc10.patch | 38 ++++++++++++++++++++++ www-servers/gatling/gatling-0.15.ebuild | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/www-servers/gatling/files/gatling-0.15-gcc10.patch b/www-servers/gatling/files/gatling-0.15-gcc10.patch new file mode 100644 index 00000000000..446ea5cffde --- /dev/null +++ b/www-servers/gatling/files/gatling-0.15-gcc10.patch @@ -0,0 +1,38 @@ +From b815fc02179e8f25a6bea2bc1ee7306ffea37258 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Thu, 26 Nov 2020 16:05:26 +0100 +Subject: [PATCH] Fix build with -fno-common or GCC 10 + +--- + dirfd.c | 1 + + dirfd.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dirfd.c b/dirfd.c +index 6a0217e..792bd29 100644 +--- a/dirfd.c ++++ b/dirfd.c +@@ -34,6 +34,7 @@ struct hashtable dc; + + #ifdef __linux__ + int rootwd; ++int ifd; + #endif + + /* initialize a hashtable as empty */ +diff --git a/dirfd.h b/dirfd.h +index cdfc4a3..a76c5d8 100644 +--- a/dirfd.h ++++ b/dirfd.h +@@ -21,7 +21,7 @@ + * given dir, and it will return the fd or -1 on error. */ + + #ifdef __linux__ +-int ifd; /* inotify fd */ ++extern int ifd; /* inotify fd */ + #endif + + struct dircacheentry { +-- +2.27.0 + diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild index ba78c1bb2f6..e206f26d046 100644 --- a/www-servers/gatling/gatling-0.15.ebuild +++ b/www-servers/gatling/gatling-0.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -25,6 +25,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-0.13-compile.patch" + "${FILESDIR}/${P}-gcc10.patch" ) src_prepare() {
