From ee1c9bb17a6894556acc79decc68ce5c9ec1e342 Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Tue, 16 Apr 2024 19:07:55 +0200 Subject: [PATCH] fix(spawn): update spawn for gcc 4.8.5 Updated to a version that contains janestreet/spawn#62. Signed-off-by: Etienne Millon --- doc/changes/10428.md | 1 + vendor/spawn/src/spawn_stubs.c | 4 ++-- vendor/update-spawn.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 doc/changes/10428.md diff --git a/doc/changes/10428.md b/doc/changes/10428.md new file mode 100644 index 00000000000..39719f68b9f --- /dev/null +++ b/doc/changes/10428.md @@ -0,0 +1 @@ +- spawn: fix compatibility with RHEL7 (#10428, @emillon) diff --git a/vendor/spawn/src/spawn_stubs.c b/vendor/spawn/src/spawn_stubs.c index b9d53aa0d7c..ac3f3d4dffa 100644 --- a/vendor/spawn/src/spawn_stubs.c +++ b/vendor/spawn/src/spawn_stubs.c @@ -523,8 +523,8 @@ static void init_spawn_info(struct spawn_info *info, caml_failwith("Unknown sigprocmask action"); } - for (value v_signals_list = Field(v_sigprocmask, 1); - v_signals_list != Val_emptylist; + value v_signals_list = Field(v_sigprocmask, 1); + for (; v_signals_list != Val_emptylist; v_signals_list = Field(v_signals_list, 1)) { int signal = caml_convert_signal_number(Long_val(Field(v_signals_list, 0))); switch (sigprocmask_command) { diff --git a/vendor/update-spawn.sh b/vendor/update-spawn.sh index ef70df36e42..2ca09ac4967 100755 --- a/vendor/update-spawn.sh +++ b/vendor/update-spawn.sh @@ -1,6 +1,6 @@ #!/bin/bash -version=6c752122070f377c2607f6969a821f166a43bd5e +version=835c49833d41221758c4ad71f07829ee259668e1 set -e -o pipefail