diff options
author | richard <richard@pkgsrc.org> | 2013-05-12 05:47:24 +0000 |
---|---|---|
committer | richard <richard@pkgsrc.org> | 2013-05-12 05:47:24 +0000 |
commit | 1dd6d3ab5f2a023c900dc998681bfb38f6afe03e (patch) | |
tree | 7402c9afb37cd305d2f1a38ac11e41cdc046cce2 /devel | |
parent | cb3a7541208b7a1268a9d216b327deaa815603fc (diff) | |
download | pkgsrc-1dd6d3ab5f2a023c900dc998681bfb38f6afe03e.tar.gz |
Force intermediate targets to be considered if they are non-intermediate for parallel builds in devel/gmake
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gmake/Makefile | 4 | ||||
-rw-r--r-- | devel/gmake/distinfo | 4 | ||||
-rw-r--r-- | devel/gmake/patches/patch-remake.c | 18 | ||||
-rw-r--r-- | devel/gmake/patches/patch-tests_scripts_features_parallelism | 31 |
4 files changed, 54 insertions, 3 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 56b1dbe86e6..f88ed50475e 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.84 2012/12/06 11:40:59 jperkin Exp $ +# $NetBSD: Makefile,v 1.85 2013/05/12 05:47:24 richard Exp $ DISTNAME= make-3.82 PKGNAME= g${DISTNAME} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index d395fc3ccf6..83ccfe804d6 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2011/02/06 12:09:50 obache Exp $ +$NetBSD: distinfo,v 1.22 2013/05/12 05:47:24 richard Exp $ SHA1 (make-3.82.tar.bz2) = b8a8a99e4cb636a213aad3816dda827a92b9bbed RMD160 (make-3.82.tar.bz2) = e3d1f7019549553b9fc7a88884c9b85d25a60d21 @@ -8,3 +8,5 @@ SHA1 (patch-ac) = de18956fde66fa3fc61a991bb3e6724d9c5b1eac SHA1 (patch-af) = aafc56a38b07ad6dc1bebb602beeb8c31cbb8c49 SHA1 (patch-ah) = 0805ae7b6001283d1cc04297b762322684c113a2 SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e +SHA1 (patch-remake.c) = b116a6bb4bbcd8488bb241f75c08301f23c071ef +SHA1 (patch-tests_scripts_features_parallelism) = ac6008d214144637bf73fcb68ba53f7ac732a4cc diff --git a/devel/gmake/patches/patch-remake.c b/devel/gmake/patches/patch-remake.c new file mode 100644 index 00000000000..447e4135af6 --- /dev/null +++ b/devel/gmake/patches/patch-remake.c @@ -0,0 +1,18 @@ +$NetBSD: patch-remake.c,v 1.1 2013/05/12 05:47:24 richard Exp $ + +upstream: http://git.savannah.gnu.org/cgit/make.git/commit/?id=fbe5b2c9cd612b962836b9391fa2b58c8baed6fc +Force intermediate targets to be considered if their non-intermediate + +--- remake.c.orig 2010-07-13 01:20:42.000000000 +0000 ++++ remake.c +@@ -614,6 +614,10 @@ update_file_1 (struct file *file, unsign + 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); + diff --git a/devel/gmake/patches/patch-tests_scripts_features_parallelism b/devel/gmake/patches/patch-tests_scripts_features_parallelism new file mode 100644 index 00000000000..f6e154e84d2 --- /dev/null +++ b/devel/gmake/patches/patch-tests_scripts_features_parallelism @@ -0,0 +1,31 @@ +$NetBSD: patch-tests_scripts_features_parallelism,v 1.1 2013/05/12 05:47:24 richard Exp $ + +upstream: http://git.savannah.gnu.org/cgit/make.git/commit/?id=fbe5b2c9cd612b962836b9391fa2b58c8baed6fc +Force intermediate targets to be considered if their non-intermediate + +--- tests/scripts/features/parallelism.orig 2010-07-05 18:32:03.000000000 +0000 ++++ tests/scripts/features/parallelism +@@ -194,6 +194,23 @@ rm main.x"); + rmfiles(qw(foo.y foo.y.in main.bar)); + } + ++# Ensure intermediate/secondary files are not pruned incorrectly. ++# See Savannah bug #30653 ++ ++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', "touch file3"); ++ ++#rmfiles('file1', 'file2', 'file3', 'file4'); ++ + if ($all_tests) { + # Jobserver FD handling is messed up in some way. + # Savannah bug #28189 |