summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/tcsh/Makefile2
-rw-r--r--package/tcsh/patches/patch-sh_h8
-rw-r--r--package/tcsh/patches/patch-sh_proc_c11
3 files changed, 16 insertions, 5 deletions
diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile
index 3cc6a23d6..b1e93b373 100644
--- a/package/tcsh/Makefile
+++ b/package/tcsh/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= tcsh
PKG_VERSION:= 6.18.01
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 6eed09dbd4223ab5b6955378450d228a
PKG_DESCR:= alternative csh
PKG_SECTION:= shells
diff --git a/package/tcsh/patches/patch-sh_h b/package/tcsh/patches/patch-sh_h
index 029fca58f..c3d460ff6 100644
--- a/package/tcsh/patches/patch-sh_h
+++ b/package/tcsh/patches/patch-sh_h
@@ -1,6 +1,6 @@
---- tcsh-6.17.00.orig/sh.h 2009-06-25 23:27:37.000000000 +0200
-+++ tcsh-6.17.00/sh.h 2010-07-31 19:48:01.000000000 +0200
-@@ -338,7 +338,7 @@ static inline void ignore(intptr_t a)
+--- tcsh-6.18.01.orig/sh.h 2011-04-14 20:25:25.000000000 +0200
++++ tcsh-6.18.01/sh.h 2013-12-25 17:12:55.000000000 +0100
+@@ -361,7 +361,7 @@ typedef long tcsh_number_t;
# include <sys/filio.h>
#endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */
@@ -9,7 +9,7 @@
# include <sys/file.h>
#endif /* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */
-@@ -375,9 +375,11 @@ static inline void ignore(intptr_t a)
+@@ -395,9 +395,11 @@ typedef long tcsh_number_t;
#include <pwd.h>
#include <grp.h>
#endif /* WINNT_NATIVE */
diff --git a/package/tcsh/patches/patch-sh_proc_c b/package/tcsh/patches/patch-sh_proc_c
new file mode 100644
index 000000000..db32df2eb
--- /dev/null
+++ b/package/tcsh/patches/patch-sh_proc_c
@@ -0,0 +1,11 @@
+--- tcsh-6.18.01.orig/sh.proc.c 2012-01-25 16:34:41.000000000 +0100
++++ tcsh-6.18.01/sh.proc.c 2013-12-25 17:17:37.000000000 +0100
+@@ -47,7 +47,7 @@ RCSID("$tcsh: sh.proc.c,v 3.121 2012/01/
+ # 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(__GNU__) || defined(__GLIBC__)
+ # if !defined(__ANDROID__)
+ # define BSDWAIT
+ # endif