From 9dd8bbb2a2ae6b25f2a947507fcc4e436606dc9b Mon Sep 17 00:00:00 2001
From: Marek Kubica <marek@tarides.com>
Date: Tue, 12 Mar 2024 15:51:29 +0100
Subject: [PATCH] fix(spawn): fix headers issues on non-glibc (#10256) (#10258)

`caml/signals.h` is not public API; it does not include `caml/config.h`
and so it will not include `signal.h` because it does not know about
`POSIX_SIGNAL`. This issue is visible on musl as "unknown type
sigset_t".

Signed-off-by: Etienne Millon <me@emillon.org>
Co-authored-by: Etienne Millon <me@emillon.org>
---
 doc/changes/10256.md           | 2 ++
 vendor/spawn/src/spawn_stubs.c | 8 +++-----
 vendor/update-spawn.sh         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 doc/changes/10256.md

diff --git a/doc/changes/10256.md b/doc/changes/10256.md
new file mode 100644
index 00000000000..b68dc869872
--- /dev/null
+++ b/doc/changes/10256.md
@@ -0,0 +1,2 @@
+- fix compilation on non-glibc systems due to `signal.h` not being pulled in
+  spawn stubs. (#10256, @emillon)
diff --git a/vendor/spawn/src/spawn_stubs.c b/vendor/spawn/src/spawn_stubs.c
index 4ff78fa4cf8..b9d53aa0d7c 100644
--- a/vendor/spawn/src/spawn_stubs.c
+++ b/vendor/spawn/src/spawn_stubs.c
@@ -15,17 +15,15 @@
 #endif
 #endif
 
-/* for [caml_convert_signal_number] */
-#include <caml/signals.h>
-
-#undef CAML_INTERNALS
-
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/unixsupport.h>
 #include <caml/fail.h>
 
+/* for [caml_convert_signal_number]; must come after public caml headers */
+#include <caml/signals.h>
+
 #include <errno.h>
 
 #if defined(__APPLE__)
diff --git a/vendor/update-spawn.sh b/vendor/update-spawn.sh
index 4954b043c40..ef70df36e42 100755
--- a/vendor/update-spawn.sh
+++ b/vendor/update-spawn.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=d5991f7eb4073c85b440789587936d14b4e0417f
+version=6c752122070f377c2607f6969a821f166a43bd5e
 
 set -e -o pipefail