diff --git a/tcsh-6.19.00-014-do-not-use-union-wait.patch b/tcsh-6.19.00-014-do-not-use-union-wait.patch new file mode 100644 index 0000000..f809036 --- /dev/null +++ b/tcsh-6.19.00-014-do-not-use-union-wait.patch @@ -0,0 +1,58 @@ +From c43b072b89f19e9b41d45bdf3946593ae9bc6e5e Mon Sep 17 00:00:00 2001 +From: christos +Date: Mon, 24 Aug 2015 07:08:42 +0000 +Subject: [PATCH 1/2] restrict BSDWAIT to __GLIBC__ because other linux + libraries (muslc) don't have the macros. + +--- + sh.proc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sh.proc.c b/sh.proc.c +index 76eca3b..ad07250 100644 +--- a/sh.proc.c ++++ b/sh.proc.c +@@ -47,7 +47,7 @@ RCSID("$tcsh$") + # define HZ 16 + #endif /* aiws */ + +-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) ++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GLIBC__) + # if !defined(__ANDROID__) + # define BSDWAIT + # endif +-- +2.5.5 + + +From eab72f9797ec4faaf1fb4de491c357f194b84dd6 Mon Sep 17 00:00:00 2001 +From: christos +Date: Thu, 14 Apr 2016 11:09:09 +0000 +Subject: [PATCH 2/2] GLIBC is getting rid of union wait. + +--- + sh.proc.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sh.proc.c b/sh.proc.c +index ad07250..5c68409 100644 +--- a/sh.proc.c ++++ b/sh.proc.c +@@ -47,11 +47,11 @@ RCSID("$tcsh$") + # define HZ 16 + #endif /* aiws */ + +-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GLIBC__) +-# if !defined(__ANDROID__) ++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) ++# if !defined(__ANDROID__) && !defined(__GLIBC__) + # define BSDWAIT + # endif +-#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ ++#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */ + #ifndef WTERMSIG + # define WTERMSIG(w) (((union wait *) &(w))->w_termsig) + # ifndef BSDWAIT +-- +2.5.5 + diff --git a/tcsh.spec b/tcsh.spec index 8c24720..85f23c0 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -42,6 +42,7 @@ Patch010: tcsh-6.19.00-010-fix-editor-and-visual-variables-and-its-behaviour.pat Patch011: tcsh-6.19.00-011-man-page-spelling-fixes.patch Patch012: tcsh-6.19.00-012-display-default-in-editor.patch Patch013: tcsh-6.19.00-013-VImode-variable-provided.patch +Patch014: tcsh-6.19.00-014-do-not-use-union-wait.patch # Downstream patches -- these should be always included when doing rebase: @@ -176,6 +177,7 @@ fi tcsh-6.19.00-011-man-page-spelling-fixes.patch tcsh-6.19.00-012-display-default-in-editor.patch tcsh-6.19.00-013-VImode-variable-provided.patch + tcsh-6.19.00-014-do-not-use-union-wait.patch * Thu Apr 21 2016 David Kaspar [Dee'Kej] - 6.19.00-6 - Drop tcsh-6.15.00-closem.patch - issue not reproducible, patch not accepted by upstream