From owner-svn-ports-head@FreeBSD.ORG Tue Aug 21 17:59:43 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 842A31065673; Tue, 21 Aug 2012 17:59:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 552138FC15; Tue, 21 Aug 2012 17:59:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7LHxhdG078998; Tue, 21 Aug 2012 17:59:43 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7LHxhjV078995; Tue, 21 Aug 2012 17:59:43 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201208211759.q7LHxhjV078995@svn.freebsd.org> From: Koop Mast Date: Tue, 21 Aug 2012 17:59:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302882 - in head/devel/gmake: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Aug 2012 17:59:43 -0000 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