Attachment 126654 Details for Bug 170408 – gmake-parallel.diff

[patch] gmake-parallel.diff

gmake-parallel.diff (text/plain), 2.60 KB, created by Koop Mast on 2012-08-06 08:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2012-08-06 08:30:12 UTC

Size: 2.60 KB

patch

obsolete

>Index: devel/gmake/files/patch-remake.c
>===================================================================
>--- devel/gmake/files/patch-remake.c	(revision 0)
>+++ devel/gmake/files/patch-remake.c	(working copy)
>@@ -0,0 +1,59 @@
>+Fix parallel builds. One port that exhibits this issue is webkit-gtk >= 1.8.
>+
>+http://savannah.gnu.org/bugs/?30653
>+
>+Index: remake.c
>+===================================================================
>+RCS file: /sources/make/make/remake.c,v
>+retrieving revision 1.147
>+diff -u -r1.147 remake.c
>+--- remake.c	13 Jul 2010 01:20:42 -0000	1.147
>++++ remake.c	5 Aug 2010 01:02:18 -0000
>+@@ -614,6 +614,12 @@
>+                 d->file->dontcare = file->dontcare;
>+               }
>+ 
>++	    /* We may have already encountered this file earlier in the same
>++	     * pass before we knew we'd be updating this target. In that 
>++	     * case calling update_file now would result in the file being 
>++	     * inappropriately pruned so we toggle the considered bit back 
>++	     * off first. */
>++            d->file->considered = !considered;
>+ 
>+ 	    dep_status |= update_file (d->file, depth);
>+ 
>+Index: tests/scripts/features/parallelism
>+===================================================================
>+RCS file: /sources/make/make/tests/scripts/features/parallelism,v
>+retrieving revision 1.16
>+diff -u -r1.16 parallelism
>+--- tests/scripts/features/parallelism	5 Jul 2010 18:32:03 -0000	1.16
>++++ tests/scripts/features/parallelism	5 Aug 2010 01:02:18 -0000
>+@@ -164,6 +164,27 @@
>+ 
>+ rmfiles('inc.mk');
>+ 
>++utouch(-15, 'file2');
>++utouch(-10, 'file4');
>++utouch(-5,  'file1');
>++
>++run_make_test(q!
>++.INTERMEDIATE: file3
>++
>++file4: file3
>++	@mv -f $< $@
>++
>++file3: file2
>++	@touch $@
>++
>++file2: file1
>++	@touch $@
>++!,
>++              '--no-print-directory -j2');
>++
>++rmfiles('file1', 'file2', 'file3', 'file4');
>++
>++
>+ if ($all_tests) {
>+     # Implicit files aren't properly recreated during parallel builds
>+     # Savannah bug #26864
>
>Property changes on: devel/gmake/files/patch-remake.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 301872)
>+++ devel/gmake/Makefile	(working copy)
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	gmake
> PORTVERSION=	3.82
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	make

Actions: View | Diff

Attachments on bug 170408: 126654