Browse Source

Patch a WIFCONTINUED definition to <sys/wait.h>

This fixes job control in bash and zsh
android-5
Fredrik Fornwall 10 years ago
parent
commit
f0d4e3805a
  1. 9
      ndk_patches/sys-wait.h.patch
  2. 6
      packages/bash/build.sh
  3. 2
      packages/zsh/build.sh

9
ndk_patches/sys-wait.h.patch

@ -1,7 +1,12 @@
diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/sys/wait.h ./usr/include/sys/wait.h
--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/sys/wait.h 2014-10-14 22:53:49.000000000 -0400
+++ ./usr/include/sys/wait.h 2015-07-11 16:55:21.567042577 -0400
@@ -48,6 +48,8 @@
+++ ./usr/include/sys/wait.h 2015-08-06 18:52:27.784988266 -0400
@@ -44,10 +44,13 @@
#define WIFEXITED(s) (WTERMSIG(s) == 0)
#define WIFSTOPPED(s) (WTERMSIG(s) == 0x7f)
#define WIFSIGNALED(s) (WTERMSIG((s)+1) >= 2)
+#define WIFCONTINUED(s) ((s) == 0xffff)
extern pid_t wait(int *);
extern pid_t waitpid(pid_t, int *, int);
extern pid_t wait4(pid_t, int *, int, struct rusage *);

6
packages/bash/build.sh

@ -4,9 +4,13 @@ TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command
_MAIN_VERSION=4.3
_PATCH_VERSION=39
TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
TERMUX_PKG_BUILD_REVISION=5
TERMUX_PKG_BUILD_REVISION=6
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline ac_cv_header_grp_h=no ac_cv_header_pwd_h=no ac_cv_rl_version=6.3"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_job_control_missing=present"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_sys_siglist=yes"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_func_sigsetjmp=present"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_unusable_rtsigs=no"
TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug"

2
packages/zsh/build.sh

@ -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=4
TERMUX_PKG_BUILD_REVISION=5
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, command-not-found"

Loading…
Cancel
Save