zsh: Disable TIOCSETD ioctl during initialization
authorFredrik Fornwall <fredrik@fornwall.net>
Sat, 11 Jul 2015 21:56:19 +0000 (17:56 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Sat, 11 Jul 2015 21:56:19 +0000 (17:56 -0400)
packages/zsh/build.sh
packages/zsh/src-init.c.patch [new file with mode: 0644]

index 91dc329..606607e 100644 (file)
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE="http://www.zsh.org/"
 TERMUX_PKG_DESCRIPTION="Shell designed for interactive use, although it is also a powerful scripting language"
 TERMUX_PKG_VERSION=5.0.8
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL="http://downloads.sourceforge.net/project/zsh/zsh/${TERMUX_PKG_VERSION}/zsh-${TERMUX_PKG_VERSION}.tar.bz2"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools"
diff --git a/packages/zsh/src-init.c.patch b/packages/zsh/src-init.c.patch
new file mode 100644 (file)
index 0000000..beacca9
--- /dev/null
@@ -0,0 +1,23 @@
+This call just slow things done noticably (and permission is denied).
+
+diff -u -r ../zsh-5.0.8/Src/init.c ./Src/init.c
+--- ../zsh-5.0.8/Src/init.c    2015-04-26 16:31:15.000000000 -0400
++++ ./Src/init.c       2015-07-11 17:51:00.761656735 -0400
+@@ -631,7 +631,7 @@
+ init_shout(void)
+ {
+     static char shoutbuf[BUFSIZ];
+-#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC)
++#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC) && !defined(__ANDROID__)
+     int ldisc;
+ #endif
+@@ -642,7 +642,7 @@
+       return;
+     }
+-#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC)
++#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC) && !defined(__ANDROID__)
+     ldisc = NTTYDISC;
+     ioctl(SHTTY, TIOCSETD, (char *)&ldisc);
+ #endif