On Wed, 17 Feb 2021 21:48:36, Jeff Hostetler wrote:
>Here is V4 of my "Simple IPC" series. It addresses Gábor's comment WRT >shutting down the server to make unit tests more predictable on CI servers. >(https://lore.kernel.org/git/20210213093052.GJ1015009@szeder.dev)
I missed this at the time, but it appears that ipc-unix-socket.c forces a dependency on pthreads for Git under Unix-like platforms. This is probably not a correct assumption (or likely intended), but causes git to no longer build on NonStop x86 and ia64 as of 2.32.0-rc0. I am not suggesting undoing this, but amending to make the change more sensitive to a lack of pthread support. pthread_sigmask() showed up as an undefined external:
**** ERROR **** [1210]: libgit.a(ipc-unix-socket.o): In function `thread_block_sigpipe': ipc-unix-socket.o(.text+0xb87): unresolved reference to pthread_sigmask.
On NonStop, pthread_sigmask is defined in -lput or -lspt, which are not used in our build and would cause a bunch of other issues if referenced. The build does define NO_PTHREADS.
A simple, but probably wrong fix to get the build to work is:
Show changes to compat/simple-ipc/ipc-unix-socket.c +2 −2
diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c index 38689b278d..07b2c407c1 100644 --- a/compat/simple-ipc/ipc-unix-socket.c +++ b/compat/simple-ipc/ipc-unix-socket.c @@ -535,7 +535,9 @@ static void thread_block_sigpipe(sigset_t *old_set) sigaddset(&new_set, SIGPIPE); sigemptyset(old_set); +#ifndef NO_PTHREADS pthread_sigmask(SIG_BLOCK, &new_set, old_set); +#endif } But I suspect that this will not perform the desired action associated with blocking the signal, although since we are not in a threading situation, that might be fine. Thoughts? Randall -- Brief whoami: NonStop developer since approximately 211288444200000000 UNIX developer since approximately 421664400 IBM developer since "I'm not talking about it" -- In my real life, I talk too much.