Attachment #190632 for bug #225899





PORTNAME=	gmake
PORTVERSION=	4.2.1
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	GNU/make
DISTNAME=	make-${PORTVERSION}

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-prefix=g \
		--without-guile
# fmake does not like PO_DEPENDS_ON_POT being undefined
MAKE_ARGS=	PO_DEPENDS_ON_POT=

USES=		cpe tar:bzip2
CPE_VENDOR=	gnu

OPTIONS_DEFINE=	NLS
OPTIONS_SUB=	yes

NLS_USES=	gettext-runtime
NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
			--with-libintl-prefix=${LOCALBASE}
NLS_CONFIGURE_ENABLE=	nls

INFO=		make

Line 0 Link Here

(-)devel/gmake/files/patch-glob-glob.c (+10 lines)
	1	--- glob/glob.c.orig 2013-10-20 17:14:38 UTC
	2	+++ glob/glob.c
	3	@@ -203,7 +203,6 @@ my_realloc (p, n)
	4	return (char *) malloc (n);
	5	return (char *) realloc (p, n);
	6	}
	7	-# define realloc my_realloc
	8	# endif /* __SASC */
	9	#endif /* __GNU_LIBRARY__ \|\| __DJGPP__ */
	10




--- 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

Return to bug 225899

Lines 3-9 Link Here

(-)devel/gmake/Makefile (-6 / +2 lines)
3		3
4	PORTNAME= gmake	4	PORTNAME= gmake
5	PORTVERSION= 4.2.1	5	PORTVERSION= 4.2.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= GNU/make	8	MASTER_SITES= GNU/make
9	DISTNAME= make-${PORTVERSION}	9	DISTNAME= make-${PORTVERSION}
Lines 20-27 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS= --program-prefix=g \	21	CONFIGURE_ARGS= --program-prefix=g \
22	--without-guile	22	--without-guile
23	# fmake does not like PO_DEPENDS_ON_POT being undefined
24	MAKE_ARGS= PO_DEPENDS_ON_POT=
25		23
26	USES= cpe tar:bzip2	24	USES= cpe tar:bzip2
27	CPE_VENDOR= gnu	25	CPE_VENDOR= gnu
Lines 29-37 CPE_VENDOR= gnu Link Here
29	OPTIONS_DEFINE= NLS	27	OPTIONS_DEFINE= NLS
30	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
31		29
32	NLS_USES= gettext iconv	30	NLS_USES= gettext-runtime
33	NLS_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} \
34	--with-libintl-prefix=${LOCALBASE}
35	NLS_CONFIGURE_ENABLE= nls	31	NLS_CONFIGURE_ENABLE= nls
36		32
37	INFO= make	33	INFO= make

Line 0 Link Here

(-)devel/gmake/files/patch-posixos.c (+33 lines)
	1	--- posixos.c.orig 2016-05-21 20:21:52 UTC
	2	+++ posixos.c
	3	@@ -77,6 +77,10 @@ jobserver_setup (int slots)
	4	if (r != 1)
	5	pfatal_with_name (_("init jobserver pipe"));
	6	}
	7	+#ifdef HAVE_PSELECT
	8	+ int flags = fcntl(job_fds[0], F_GETFL, 0);
	9	+ fcntl(job_fds[0], F_SETFL, flags \| O_NONBLOCK);
	10	+#endif
	11
	12	return 1;
	13	}
	14	@@ -112,6 +116,10 @@ jobserver_parse_auth (const char *auth)
	15
	16	return 0;
	17	}
	18	+#ifdef HAVE_PSELECT
	19	+ int flags = fcntl(job_fds[0], F_GETFL, 0);
	20	+ fcntl(job_fds[0], F_SETFL, flags \| O_NONBLOCK);
	21	+#endif
	22
	23	return 1;
	24	}
	25	@@ -275,7 +283,7 @@ jobserver_acquire (int timeout)
	26
	27	/* The read FD is ready: read it! */
	28	EINTRLOOP (r, read (job_fds[0], &intake, 1));
	29	- if (r < 0)
	30	+ if (r < 0 && errno != EAGAIN)
	31	pfatal_with_name (_("read jobs pipe"));
	32
	33	/* What does it mean if read() returns 0? It shouldn't happen because only