From 3879280345241ec5dfdafbee41cbe44f515619bc Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 1 Mar 2022 21:44:31 +0100 Subject: [PATCH] ndk-patches: remove wait3 patch from sys/wait.h It was added specifically for busybox, and busybox > 1.33 now implements its own workaround, so should hopefully be no need for this patch anymore. --- ndk-patches/sys-wait.h.patch | 13 ------------- scripts/build/termux_step_start_build.sh | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 ndk-patches/sys-wait.h.patch diff --git a/ndk-patches/sys-wait.h.patch b/ndk-patches/sys-wait.h.patch deleted file mode 100644 index eab990213..000000000 --- a/ndk-patches/sys-wait.h.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr sysroot.orig/usr/include/sys/wait.h sysroot/usr/include/sys/wait.h ---- sysroot.orig/usr/include/sys/wait.h 2019-02-12 16:12:24.000000000 +0000 -+++ sysroot/usr/include/sys/wait.h 2019-03-20 13:28:06.689331544 +0000 -@@ -46,6 +46,9 @@ - // Implemented as a static inline before 18. - #endif - -+/* 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) { return wait4(-1, status, options, rusage); } -+ - /* 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 - * instead. diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index 7c5439703..0be95a2d1 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -2,7 +2,7 @@ termux_step_start_build() { TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/android-r${TERMUX_NDK_VERSION}-api-${TERMUX_PKG_API_LEVEL}" # Bump the below version if a change is made in toolchain setup to ensure # that everyone gets an updated toolchain: - TERMUX_STANDALONE_TOOLCHAIN+="-v6" + TERMUX_STANDALONE_TOOLCHAIN+="-v7" # shellcheck source=/dev/null source "$TERMUX_PKG_BUILDER_SCRIPT"