Browse Source

Fix wait3() function and bump build revisions

android-5
Fredrik Fornwall 10 years ago
parent
commit
49ca09e5e5
  1. 2
      ndk_patches/sys-wait.h.patch
  2. 1
      packages/apr/build.sh
  3. 2
      packages/bash/build.sh
  4. 1
      packages/busybox/build.sh
  5. 1
      packages/dash/build.sh
  6. 1
      packages/inetutils/build.sh
  7. 1
      packages/ttyrec/build.sh
  8. 2
      packages/zsh/build.sh

2
ndk_patches/sys-wait.h.patch

@ -6,7 +6,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
extern pid_t waitpid(pid_t, int *, int); extern pid_t waitpid(pid_t, int *, int);
extern pid_t wait4(pid_t, int *, int, struct rusage *); extern pid_t wait4(pid_t, int *, int, struct rusage *);
+/* Termux addition: Add wait3() declaration used by busybox. Available in libc for 32-bit only. */ +/* Termux addition: Add wait3() declaration used by busybox. Available in libc for 32-bit only. */
+static pid_t wait3(int* status, int options, struct rusage* rusage) { wait4(-1, status, options, rusage); } +static pid_t wait3(int* status, int options, struct rusage* rusage) { return wait4(-1, status, options, rusage); }
/* Posix states that idtype_t should be an enumeration type, but /* Posix states that idtype_t should be an enumeration type, but
* the kernel headers define P_ALL, P_PID and P_PGID as constant macros * the kernel headers define P_ALL, P_PID and P_PGID as constant macros

1
packages/apr/build.sh

@ -1,4 +1,5 @@
TERMUX_PKG_VERSION=1.5.2 TERMUX_PKG_VERSION=1.5.2
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://archive.apache.org/dist/apr/apr-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=http://archive.apache.org/dist/apr/apr-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_HOMEPAGE=https://apr.apache.org/ TERMUX_PKG_HOMEPAGE=https://apr.apache.org/
TERMUX_PKG_DESCRIPTION="Apache Portable Runtime - library providing a predictable and consistent interface to underlying platform-specific implementations" TERMUX_PKG_DESCRIPTION="Apache Portable Runtime - library providing a predictable and consistent interface to underlying platform-specific implementations"

2
packages/bash/build.sh

@ -4,7 +4,7 @@ TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools"
_MAIN_VERSION=4.3 _MAIN_VERSION=4.3
_PATCH_VERSION=39 _PATCH_VERSION=39
TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION} TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_BUILD_REVISION=2
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz 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="--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"

1
packages/busybox/build.sh

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.busybox.net/
TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_ESSENTIAL=yes
TERMUX_PKG_VERSION=1.23.2 TERMUX_PKG_VERSION=1.23.2
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes

1
packages/dash/build.sh

@ -1,6 +1,7 @@
TERMUX_PKG_HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/ TERMUX_PKG_HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
TERMUX_PKG_DESCRIPTION="Small POSIX-compliant implementation of /bin/sh" TERMUX_PKG_DESCRIPTION="Small POSIX-compliant implementation of /bin/sh"
TERMUX_PKG_VERSION=0.5.8 TERMUX_PKG_VERSION=0.5.8
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz
CFLAGS+=" -DAT_EACCESS=0x200" CFLAGS+=" -DAT_EACCESS=0x200"

1
packages/inetutils/build.sh

@ -1,6 +1,7 @@
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/inetutils/ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/inetutils/
TERMUX_PKG_DESCRIPTION="Collection of common network programs" TERMUX_PKG_DESCRIPTION="Collection of common network programs"
TERMUX_PKG_VERSION=1.9.4 TERMUX_PKG_VERSION=1.9.4
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="readline" TERMUX_PKG_DEPENDS="readline"
# These are old cruft / not suited for android: # These are old cruft / not suited for android:

1
packages/ttyrec/build.sh

@ -1,6 +1,7 @@
TERMUX_PKG_HOMEPAGE=http://0xcc.net/ttyrec/ TERMUX_PKG_HOMEPAGE=http://0xcc.net/ttyrec/
TERMUX_PKG_DESCRIPTION="Terminal recorder and player" TERMUX_PKG_DESCRIPTION="Terminal recorder and player"
TERMUX_PKG_VERSION=1.0.8 TERMUX_PKG_VERSION=1.0.8
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://0xcc.net/ttyrec/ttyrec-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=http://0xcc.net/ttyrec/ttyrec-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes

2
packages/zsh/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE="http://www.zsh.org/" 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_DESCRIPTION="Shell designed for interactive use, although it is also a powerful scripting language"
TERMUX_PKG_VERSION=5.0.8 TERMUX_PKG_VERSION=5.0.8
TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_BUILD_REVISION=2
TERMUX_PKG_SRCURL="http://downloads.sourceforge.net/project/zsh/zsh/${TERMUX_PKG_VERSION}/zsh-${TERMUX_PKG_VERSION}.tar.bz2" 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_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}"
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools" TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools"

Loading…
Cancel
Save