--- posixos.c.orig	2016-05-21 20:21:52 UTC

+++ posixos.c

@@ -77,6 +77,10 @@ jobserver_setup (int slots)

       if (r != 1)

         pfatal_with_name (_("init jobserver pipe"));

     }

+#ifdef HAVE_PSELECT

+  int flags = fcntl(job_fds[0], F_GETFL, 0);

+  fcntl(job_fds[0], F_SETFL, flags | O_NONBLOCK);

+#endif

   return 1;

 }

@@ -112,6 +116,10 @@ jobserver_parse_auth (const char *auth)

       return 0;

     }

+#ifdef HAVE_PSELECT

+  int flags = fcntl(job_fds[0], F_GETFL, 0);

+  fcntl(job_fds[0], F_SETFL, flags | O_NONBLOCK);

+#endif

   return 1;

 }

@@ -275,7 +283,7 @@ jobserver_acquire (int timeout)

   /* The read FD is ready: read it!  */

   EINTRLOOP (r, read (job_fds[0], &intake, 1));

-  if (r < 0)

+  if (r < 0 && errno != EAGAIN)

     pfatal_with_name (_("read jobs pipe"));

   /* What does it mean if read() returns 0?  It shouldn't happen because only