bump(main/dash): 0.5.13.4#29812
Draft
TomJo2000 wants to merge 1 commit into
Draft
Conversation
TomJo2000
commented
May 17, 2026
| TERMUX_PKG_ESSENTIAL=true | ||
| TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static" | ||
| TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" | ||
| ac_cv_func_wait3=yes |
Member
Author
There was a problem hiding this comment.
Setting ac_cv_func_wait3 causes HAVE_WAIT3 to be defined which puts us back into the codepath from dash <0.5.13.
Here's the relevant hunks from the upstream commit.
da72f69 shell: Add VxWorks support
diff --git a/configure.ac b/configure.ac
index ba4856a..bb09534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_ARG_ENABLE(glob, AS_HELP_STRING(--enable-glob, [Use glob(3) from libc]))
dnl Checks for libraries.
dnl Checks for header files.
-AC_CHECK_HEADERS(alloca.h paths.h)
+AC_CHECK_HEADERS(alloca.h paths.h sys/wait.h)
dnl Check for declarations
AC_CHECK_DECL([_PATH_BSHELL],,AC_DEFINE_UNQUOTED([_PATH_BSHELL], "/bin/sh", [Define to system shell path]),[
@@ -89,7 +89,7 @@ dnl Checks for library functions.
AC_CHECK_FUNCS(bsearch faccessat getpwnam getrlimit isalpha killpg \
memfd_create memrchr mempcpy \
sigsetmask stpcpy strchrnul strsignal strtod strtoimax \
- strtoumax sysconf tee)
+ strtoumax sysconf tee wait3)
dnl Check whether it's worth working around FreeBSD PR kern/125009.
dnl The traditional behavior of access/faccessat is crazy, but
diff --git a/src/jobs.c b/src/jobs.c
index 83d9694..143f15c 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -1199,7 +1199,11 @@ waitproc(int block, int *status)
do {
gotsigchld = 0;
do
+#ifdef HAVE_WAIT3
err = wait3(status, flags, NULL);
+#else
+ err = waitpid((pid_t)-1, status, flags, NULL);
+#endif
while (err < 0 && errno == EINTR);
if (err || (err = -!block))
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Had to add
ac_cv_func_wait3=yesto get it to build now.This seems to have been caused by
da72f698which has been indashsince0.5.13.Still needs validation testing on-device since this is an essential package and provides our
sh.