From 8f37cbe3c54d6e8a9e139d34ce70bd315aa93a33 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Mon, 28 Sep 2020 20:49:51 +0800 Subject: [PATCH] Fix FTBFS on gcc10 this change has given better compatible with both gcc8 and gcc10 toolchain, should be maintained util upstream fixes Signed-off-by: weitao zhou --- 1001-tcsh-6.22.02-avoid-gcc-to-fail.patch | 11 +++++++++++ tcsh.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 1001-tcsh-6.22.02-avoid-gcc-to-fail.patch diff --git a/1001-tcsh-6.22.02-avoid-gcc-to-fail.patch b/1001-tcsh-6.22.02-avoid-gcc-to-fail.patch new file mode 100644 index 0000000..1f3f324 --- /dev/null +++ b/1001-tcsh-6.22.02-avoid-gcc-to-fail.patch @@ -0,0 +1,11 @@ +diff -Nuar tcsh-6.20.00.orig/tc.sig.c tcsh-6.20.00/tc.sig.c +--- tcsh-6.20.00.orig/tc.sig.c 2012-01-25 23:34:41.000000000 +0800 ++++ tcsh-6.20.00/tc.sig.c 2020-09-28 20:46:54.268308795 +0800 +@@ -60,7 +60,6 @@ + int phup_disabled; /* = 0; */ + int pchild_disabled; /* = 0; */ + int pintr_disabled; /* = 0; */ +-int handle_interrupt; /* = 0; */ + + int + handle_pending_signals(void) diff --git a/tcsh.spec b/tcsh.spec index ea6c813..77cd028 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # === GLOBAL MACROS =========================================================== # According to Fedora Package Guidelines, it is advised that packages that can @@ -13,7 +14,7 @@ Name: tcsh Summary: An enhanced version of csh, the C shell Version: 6.20.00 -Release: 13%{?dist} +Release: 13%{anolis_release}%{?dist} License: BSD URL: http://www.tcsh.org/ @@ -61,6 +62,10 @@ Patch014: tcsh-6.20.00-014-call-stderror-consistently-and-avoid-inf-loops.patch # Downstream patches -- these should be always included when doing rebase: # ------------------ Patch100: tcsh-6.20.00-manpage-memoryuse.patch +# Begin: Anolis customized patches +# Backport from fc32 to fix FTBFS on gcc10 +Patch1001: 1001-tcsh-6.22.02-avoid-gcc-to-fail.patch +# End: Anolis customized patches # Downstream patches for RHEL -- patches that we keep only in RHEL for various @@ -190,6 +195,9 @@ fi # ============================================================================= %changelog +* Mon Dec 13 2021 Weitao Zhou - 6.20.00-13.0.1 +- Fix FTBFS on gcc10 + * Mon Nov 16 2020 Jan Macku - 6.20.00-13 - fix regression caused by corrupted history (#1818766) -- Gitee