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.
This commit is contained in:
Henrik Grimler 2022-03-01 21:44:31 +01:00
parent 8b9576b49d
commit 3879280345
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 1 additions and 14 deletions

View File

@ -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.

View File

@ -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"