[gentoo-commits] gentoo-x86 commit in sys-devel/make/files: make-3.81-jobserver.patch

[Robin H. Johnson (robbat2)]

robbat2     10/03/31 22:42:05

  Added:                make-3.81-jobserver.patch
  Log:
  Bug #193258 reported some parallel make failures for complex cases. The original patch with that was not however suitable, so take the much simplier patch that Fedora did instead.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-devel/make/files/make-3.81-jobserver.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/make/files/make-3.81-jobserver.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/make/files/make-3.81-jobserver.patch?rev=1.1&content-type=text/plain

Index: make-3.81-jobserver.patch
===================================================================
diff -urp make-3.81/main.c make-3.81-pm/main.c
--- make-3.81/main.c	2007-09-24 15:28:34.000000000 +0200
+++ make-3.81-pm/main.c	2007-09-24 15:32:50.000000000 +0200
@@ -1669,8 +1669,12 @@ main (int argc, char **argv, char **envp
 
     if (job_slots > 0)
       {
-        close (job_fds[0]);
-        close (job_fds[1]);
+	if (restarts == 0)
+	  {
+	    close (job_fds[0]);
+	    close (job_fds[1]);
+	  }
+
         job_fds[0] = job_fds[1] = -1;
         free (jobserver_fds->list);
         free (jobserver_fds);