diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2012-08-21 17:59:42 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2012-08-21 17:59:42 +0000 |
| commit | 36431f58e139deb1542753f07ca97369339427de (patch) | |
| tree | 23afc90ab2ebd5e8ac360b5465f3ea6f086e7d73 /devel/gmake | |
| parent | ef657d9669f49ac429be35f9a93054f508537355 (diff) | |
| download | ports-36431f58e139deb1542753f07ca97369339427de.tar.gz ports-36431f58e139deb1542753f07ca97369339427de.zip | |
Notes
Diffstat (limited to 'devel/gmake')
| -rw-r--r-- | devel/gmake/Makefile | 1 | ||||
| -rw-r--r-- | devel/gmake/files/patch-remake.c | 59 |
2 files changed, 60 insertions, 0 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index d48342ab0494..6432c1153944 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -7,6 +7,7 @@ PORTNAME= gmake PORTVERSION= 3.82 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= make diff --git a/devel/gmake/files/patch-remake.c b/devel/gmake/files/patch-remake.c new file mode 100644 index 000000000000..8a72a2c02804 --- /dev/null +++ b/devel/gmake/files/patch-remake.c @@ -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 |