fix(main/uwsgi): drop patch for wait_for_threads because pthread_cancel is not used anymore

This commit is contained in:
Sylirre 2024-04-17 14:21:19 +03:00
parent b1501b958f
commit bf7ad94f08
No known key found for this signature in database
GPG Key ID: D3611414834B814C
2 changed files with 1 additions and 16 deletions

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="uWSGI application server container"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.0.25.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/unbit/uwsgi/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=a1e4a401f71d29e49d4762223412c32a42594c415f9d72d0f759680e5b8f4cf9
TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-sysv-semaphore, libandroid-utimes, libcap, libcrypt, libjansson, libuuid, libxml2, openssl, pcre, python"

View File

@ -1,22 +1,6 @@
diff -uNr uwsgi-2.0.25.1/core/uwsgi.c uwsgi-2.0.25.1.mod/core/uwsgi.c
--- uwsgi-2.0.25.1/core/uwsgi.c 2024-04-15 22:43:55.000000000 +0300
+++ uwsgi-2.0.25.1.mod/core/uwsgi.c 2024-04-17 13:58:37.488293121 +0300
@@ -1198,6 +1198,7 @@
// This function is called from signal handler or main thread to wait worker threads.
// `uwsgi.workers[uwsgi.mywid].manage_next_request` should be set to 0 to stop worker threads.
static void wait_for_threads() {
+#ifndef __ANDROID__
int i, ret;
// This option was added because we used pthread_cancel().
@@ -1217,6 +1218,7 @@
}
}
}
+#endif
}
@@ -2690,7 +2692,7 @@
#ifdef __APPLE__
uwsgi_string_new_list(&uwsgi.mime_file, "/etc/apache2/mime.types");