https://savannah.gnu.org/bugs/?30653
Committed upstream.

This is supposed to fix parallel builds of webkit.
(Seems to work on first try.)

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile    29 Mar 2012 13:38:13 -0000      1.47
+++ Makefile    30 Sep 2012 20:37:39 -0000
@@ -4,7 +4,7 @@ COMMENT=        GNU make
 
 DISTNAME=      make-3.82
 PKGNAME=       g${DISTNAME}
-REVISION=      1
+REVISION=      2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
 
Index: patches/patch-remake_c
===================================================================
RCS file: patches/patch-remake_c
diff -N patches/patch-remake_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-remake_c      30 Sep 2012 20:37:39 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+https://savannah.gnu.org/bugs/?30653
+
+--- remake.c.orig      Tue Jul 13 03:20:42 2010
++++ remake.c   Sun Sep 30 19:26:42 2012
+@@ -614,6 +614,10 @@ update_file_1 (struct file *file, unsigned int depth)
+                 d->file->dontcare = file->dontcare;
+               }
+ 
++            /* We may have already considered this file, when we didn't know
++               we'd need to update it.  Force update_file() to consider it and
++               not prune it.  */
++            d->file->considered = !considered;
+ 
+           dep_status |= update_file (d->file, depth);
+ 
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to