From kwm@FreeBSD.org  Mon Aug  6 07:24:33 2012
Return-Path: <kwm@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B4DA4106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Aug 2012 07:24:33 +0000 (UTC)
	(envelope-from kwm@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id A1C898FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Aug 2012 07:24:33 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q767OXYF072867
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 6 Aug 2012 07:24:33 GMT
	(envelope-from kwm@freefall.freebsd.org)
Received: (from kwm@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q767OXKh072866;
	Mon, 6 Aug 2012 07:24:33 GMT
	(envelope-from kwm)
Message-Id: <201208060724.q767OXKh072866@freefall.freebsd.org>
Date: Mon, 6 Aug 2012 07:24:33 GMT
From: Koop Mast <kwm@FreeBSD.org>
Reply-To: Koop Mast <kwm@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [exp-run] gmake bug fix parallel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170408
>Category:       ports
>Synopsis:       [exp-run] gmake bug fix parallel build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kwm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 06 07:30:12 UTC 2012
>Closed-Date:    Tue Aug 21 18:01:58 UTC 2012
>Last-Modified:  Tue Aug 21 18:01:58 UTC 2012
>Originator:     Koop Mast
>Release:        FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 9.0-STABLE FreeBSD 9.0-STABLE #6 r235139: Tue May 8 21:19:03 UTC 2012 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
	Requesting a gmake exp run to test a patch that fixes some parallel build
	issue, and doesn't break anything else.

	Background: webkit 1.8 exposes a bug in gmake -j support. the patch
	was lifted from a 2 year old gmake bug. Ade gave already the go ahead
	since the may be more wide-ranging then just webkit, and would be useful
	if we put parallel building on by default.
	
>How-To-Repeat:
>Fix:

	

--- gmake-parallel.diff begins here ---
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
--- gmake-parallel.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: kwm 
Responsible-Changed-When: Mon Aug 6 07:35:08 UTC 2012 
Responsible-Changed-Why:  
over to portmgr 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170408 
Responsible-Changed-From-To: portmgr->beat 
Responsible-Changed-By: beat 
Responsible-Changed-When: Sun Aug 12 09:54:24 UTC 2012 
Responsible-Changed-Why:  
Take for exp-run. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170408 
Responsible-Changed-From-To: beat->kwm 
Responsible-Changed-By: beat 
Responsible-Changed-When: Tue Aug 14 07:42:08 UTC 2012 
Responsible-Changed-Why:  
Exp-run is finished. No problems occured during the build. 

If you like you can review the error logs too: 
http://pointyhat.freebsd.org/errorlogs/amd64-9-exp-latest/ 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170408 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170408: commit references a PR
Date: Tue, 21 Aug 2012 17:59:53 +0000 (UTC)

 Author: kwm
 Date: Tue Aug 21 17:59:42 2012
 New Revision: 302882
 URL: http://svn.freebsd.org/changeset/ports/302882
 
 Log:
   Add a patch from upstream bugtracker to fix some jobs related build failures
   exposed by webkit-gtk2 1.8.x.
   
   PR:		ports/170408
   Exp-run by:	beat@
   Approved by:	autotools@ (ade)
   Obtained from:	gmake bugtracker http://savannah.gnu.org/bugs/?30653
 
 Added:
   head/devel/gmake/files/patch-remake.c   (contents, props changed)
 Modified:
   head/devel/gmake/Makefile
 
 Modified: head/devel/gmake/Makefile
 ==============================================================================
 --- head/devel/gmake/Makefile	Tue Aug 21 17:39:36 2012	(r302881)
 +++ head/devel/gmake/Makefile	Tue Aug 21 17:59:42 2012	(r302882)
 @@ -7,6 +7,7 @@
  
  PORTNAME=	gmake
  PORTVERSION=	3.82
 +PORTREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	${MASTER_SITE_GNU}
  MASTER_SITE_SUBDIR=	make
 
 Added: head/devel/gmake/files/patch-remake.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/gmake/files/patch-remake.c	Tue Aug 21 17:59:42 2012	(r302882)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: kwm 
State-Changed-When: Tue Aug 21 18:01:43 UTC 2012 
State-Changed-Why:  
Committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170408 
>Unformatted:
