Attachment 190630 Details for Bug 225899 – upstream patch to fix gmake jobserver hang when using pselect()

[patch] upstream patch to fix gmake jobserver hang when using pselect()

gmake.patch (text/plain), 1.87 KB, created by Don Lewis on 2018-02-14 18:43:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2018-02-14 18:43:23 UTC

Size: 1.87 KB

patch

obsolete

>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 461359)
>+++ devel/gmake/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gmake
> PORTVERSION=	4.2.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	GNU/make
> DISTNAME=	make-${PORTVERSION}
>Index: devel/gmake/files/patch-posixos.c
>===================================================================
>--- devel/gmake/files/patch-posixos.c	(nonexistent)
>+++ devel/gmake/files/patch-posixos.c	(working copy)
>@@ -0,0 +1,33 @@
>+--- 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
>
>Property changes on: devel/gmake/files/patch-posixos.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 225899: 190630 | 190631 | 190632 | 190687