From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E60121382C5 for ; Thu, 26 Nov 2020 15:13:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29F57E0891; Thu, 26 Nov 2020 15:13:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10993E0891 for ; Thu, 26 Nov 2020 15:13:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E6CF340EB7 for ; Thu, 26 Nov 2020 15:13:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2500C42F for ; Thu, 26 Nov 2020 15:13:48 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1606403594.c00abe05e686dff46288a9ae7c887d92b93c3cef.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/, www-servers/gatling/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/gatling/files/gatling-0.15-gcc10.patch www-servers/gatling/gatling-0.15.ebuild X-VCS-Directories: www-servers/gatling/files/ www-servers/gatling/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: c00abe05e686dff46288a9ae7c887d92b93c3cef X-VCS-Branch: master Date: Thu, 26 Nov 2020 15:13:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 52638941-8647-4dc9-98ce-04f7805c28da X-Archives-Hash: adb240f886ffc6619fbd1728221dfd13 commit: c00abe05e686dff46288a9ae7c887d92b93c3cef Author: Sebastian Pipping gentoo org> AuthorDate: Thu Nov 26 15:10:25 2020 +0000 Commit: Sebastian Pipping gentoo 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 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 +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() {