[gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/, app-shells/tcsh/files/

[Fabian Groffen]

commit:     de0c24161e6a2e4bdf83040268064b0b65df28c4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 08:45:00 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 08:45:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0c2416

app-shells/tcsh-6.21.00-r1: fix compilation with GCC 10/-fno-common

Closes: https://bugs.gentoo.org/706316
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .../tcsh/files/tcsh-6.21.00-fno-common.patch       | 22 ++++++++++++++++++++++
 ...{tcsh-6.21.00.ebuild => tcsh-6.21.00-r1.ebuild} |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
new file mode 100644
index 00000000000..b5a0cf0600a
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
@@ -0,0 +1,22 @@
+From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001
+From: zoulasc <christos@××××××.com>
+Date: Sat, 11 Jan 2020 11:16:51 -0500
+Subject: [PATCH] Remove extra variable definition that cause -fno-common build
+ to fail (Werner Fink)
+
+---
+ tc.sig.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tc.sig.c b/tc.sig.c
+index 77659ca..576605a 100644
+--- a/tc.sig.c
++++ b/tc.sig.c
+@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
+ int phup_disabled; /* = 0; */
+ int pchild_disabled; /* = 0; */
+ int pintr_disabled; /* = 0; */
+-int handle_interrupt; /* = 0; */
+ 
+ int
+ handle_pending_signals(void)

diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
similarity index 96%
rename from app-shells/tcsh/tcsh-6.21.00.ebuild
rename to app-shells/tcsh/tcsh-6.21.00-r1.ebuild
index 8085148f47f..8adadc2e6cc 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00-r1.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=6
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.18.01-aix.patch
 	"${FILESDIR}"/${PN}-6.21.00-no-nls.patch
 	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
+	"${FILESDIR}"/${PN}-6.21.00-fno-common.patch # upstream
 )
 
 src_prepare() {