snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

make: add upstream patch to fix parallel builds

This commit is contained in:
Alessio Sergi 2016-06-01 01:00:16 +02:00
parent c5178183b3
commit 533071c9c0
3 changed files with 165 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
srcpkgs/make/patches/make-4.2-double_colon_targets.patch Normal file
View File

@ -0,0 +1,164 @@
From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Tue, 31 May 2016 06:56:51 +0000
Subject: [SV 47995] Ensure forced double-colon rules work with -j.
The fix for SV 44742 had a side-effect that some double-colon targets
were skipped. This happens because the "considered" facility assumed
that all targets would be visited on each walk through the dependency
graph: we used a bit for considered and toggled it on each pass; if
we didn't walk the entire graph on every pass the bit would get out
of sync. The new behavior after SV 44742 might return early without
walking the entire graph. To fix this I changed the considered value
to an integer which is monotonically increasing: it is then never
possible to incorrectly determine that a previous pass through the
graph already considered the current target.
* filedef.h (struct file): make CONSIDERED an unsigned int.
* main.c (main): No longer need to reset CONSIDERED.
* remake.c (update_goal_chain): increment CONSIDERED rather than
inverting it between 0<->1.
(update_file_1): Reset CONSIDERED to 0 so it's re-considered.
(check_dep): Ditto.
* tests/scripts/features/double_colon: Add a regression test.
---
diff --git filedef.h filedef.h
index 507a027..14b4187 100644
--- filedef.h
+++ filedef.h
@@ -58,6 +58,8 @@ struct file
FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */
FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating
has been performed. */
+ unsigned int considered; /* equal to 'considered' if file has been
+ considered on current scan of goal chain */
int command_flags; /* Flags OR'd in for cmds; see commands.h. */
enum update_status /* Status of the last attempt to update. */
{
@@ -96,8 +98,6 @@ struct file
unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */
unsigned int pat_searched:1;/* Nonzero if we already searched for
pattern-specific variables. */
- unsigned int considered:1; /* equal to 'considered' if file has been
- considered on current scan of goal chain */
unsigned int no_diag:1; /* True if the file failed to update and no
diagnostics has been issued (dontcare). */
};
diff --git main.c main.c
index 576f2e9..e606488 100644
--- main.c
+++ main.c
@@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp)
for (i = 0, d = read_files; d != 0; ++i, d = d->next)
{
- /* Reset the considered flag; we may need to look at the file
- again to print an error. */
- d->file->considered = 0;
-
if (d->file->updated)
{
/* This makefile was updated. */
diff --git remake.c remake.c
index df1a9e0..5d5d67a 100644
--- remake.c
+++ remake.c
@@ -57,8 +57,9 @@ unsigned int commands_started = 0;
static struct goaldep *goal_list;
static struct dep *goal_dep;
-/* Current value for pruning the scan of the goal chain (toggle 0/1). */
-static unsigned int considered;
+/* Current value for pruning the scan of the goal chain.
+ All files start with considered == 0. */
+static unsigned int considered = 0;
static enum update_status update_file (struct file *file, unsigned int depth);
static enum update_status update_file_1 (struct file *file, unsigned int depth);
@@ -90,12 +91,12 @@ update_goal_chain (struct goaldep *goaldeps)
goal_list = rebuilding_makefiles ? goaldeps : NULL;
- /* All files start with the considered bit 0, so the global value is 1. */
- considered = 1;
-
#define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \
: file_mtime (file))
+ /* Start a fresh batch of consideration. */
+ ++considered;
+
/* Update all the goals until they are all finished. */
while (goals != 0)
@@ -247,10 +248,10 @@ update_goal_chain (struct goaldep *goaldeps)
}
}
- /* If we reached the end of the dependency graph toggle the considered
- flag for the next pass. */
+ /* If we reached the end of the dependency graph update CONSIDERED
+ for the next pass. */
if (g == 0)
- considered = !considered;
+ ++considered;
}
if (rebuilding_makefiles)
@@ -615,8 +616,8 @@ update_file_1 (struct file *file, unsigned int depth)
break;
if (!running)
- /* The prereq is considered changed if the timestamp has changed while
- it was built, OR it doesn't exist. */
+ /* The prereq is considered changed if the timestamp has changed
+ while it was built, OR it doesn't exist. */
d->changed = ((file_mtime (d->file) != mtime)
|| (mtime == NONEXISTENT_MTIME));
@@ -650,7 +651,7 @@ update_file_1 (struct file *file, unsigned int depth)
/* 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;
+ d->file->considered = 0;
new = update_file (d->file, depth);
if (new > dep_status)
@@ -1087,7 +1088,7 @@ check_dep (struct file *file, unsigned int depth,
/* If the target was waiting for a dependency it has to be
reconsidered, as that dependency might have finished. */
if (file->command_state == cs_deps_running)
- file->considered = !considered;
+ file->considered = 0;
set_command_state (file, cs_not_started);
}
diff --git tests/scripts/features/double_colon tests/scripts/features/double_colon
index 80ddb31..58f126f 100644
--- tests/scripts/features/double_colon
+++ tests/scripts/features/double_colon
@@ -197,6 +197,21 @@ all:: 3
',
'-rs -j2 1 2 root', "all_one\nall_two\nroot\n");
+# SV 47995 : Parallel double-colon rules with FORCE
+
+run_make_test('
+all:: ; @echo one
+
+all:: joe ; @echo four
+
+joe: FORCE ; touch joe-is-forced
+
+FORCE:
+',
+ '-j5', "one\ntouch joe-is-forced\nfour\n");
+
+unlink('joe-is-forced');
+
# This tells the test driver that the perl test script executed properly.
1;
--
cgit v0.9.0.2

126
srcpkgs/make/patches/make-4.2-fix_double_colon_rules_plus_parallel_builds.patch
View File

@ -1,126 +0,0 @@
http://lists.gnu.org/archive/html/bug-make/2016-05/msg00041.html
diff --git remake.c remake.c
index df1a9e0..63ee648 100644
--- remake.c
+++ remake.c
@@ -320,7 +320,7 @@ update_file (struct file *file, unsigned int depth)
&& !f->dontcare && f->no_diag))
{
DBF (DB_VERBOSE, _("Pruning file '%s'.\n"));
- return f->command_state == cs_finished ? f->update_status : us_success;
+ return f->command_state == cs_finished ? f->update_status : 0;
}
}
@@ -344,9 +344,12 @@ update_file (struct file *file, unsigned int depth)
if (f->command_state == cs_running
|| f->command_state == cs_deps_running)
- /* Don't run other :: rules for this target until
- this rule is finished. */
- return us_success;
+ {
+ /* Don't run the other :: rules for this
+ file until this rule is finished. */
+ status = us_success;
+ break;
+ }
if (new > status)
status = new;
@@ -1271,7 +1274,6 @@ FILE_TIMESTAMP
f_mtime (struct file *file, int search)
{
FILE_TIMESTAMP mtime;
- int propagate_timestamp;
/* File's mtime is not known; must get it from the system. */
@@ -1448,13 +1450,10 @@ f_mtime (struct file *file, int search)
}
}
- /* Store the mtime into all the entries for this file for which it is safe
- to do so: avoid propagating timestamps to double-colon rules that haven't
- been examined so they're run or not based on the pre-update timestamp. */
+ /* Store the mtime into all the entries for this file. */
if (file->double_colon)
file = file->double_colon;
- propagate_timestamp = file->updated;
do
{
/* If this file is not implicit but it is intermediate then it was
@@ -1466,8 +1465,7 @@ f_mtime (struct file *file, int search)
&& !file->tried_implicit && file->intermediate)
file->intermediate = 0;
- if (file->updated == propagate_timestamp)
- file->last_mtime = mtime;
+ file->last_mtime = mtime;
file = file->prev;
}
while (file != 0);
diff --git tests/scripts/features/double_colon tests/scripts/features/double_colon
index 80ddb31..1097775 100644
--- tests/scripts/features/double_colon
+++ tests/scripts/features/double_colon
@@ -151,7 +151,8 @@ two');
unlink('result','one','two');
-# TEST 10: SV 33399 : check for proper backslash handling
+# TEST 10: check for proper backslash handling
+# Savannah bug #33399
run_make_test('
a\ xb :: ; @echo one
@@ -159,47 +160,5 @@ a\ xb :: ; @echo two
',
'', "one\ntwo\n");
-# Test 11: SV 44742 : All double-colon rules should be run in parallel build.
-
-run_make_test('result :: 01
- @echo update
- @touch $@
-result :: 02
- @echo update
- @touch $@
-result :: 03
- @echo update
- @touch $@
-result :: 04
- @echo update
- @touch $@
-result :: 05
- @echo update
- @touch $@
-01 02 03 04 05:
- @touch 01 02 03 04 05
-',
- '-j10 result', "update\nupdate\nupdate\nupdate\nupdate\n");
-
-unlink('result', '01', '02', '03', '04', '05');
-
-# Test 12: SV 44742 : Double-colon rules with parallelism
-
-run_make_test('
-root: all
- echo root
-all::
- echo all_one
-all:: 3
- echo all_two
-%:
- sleep $*
-',
- '-rs -j2 1 2 root', "all_one\nall_two\nroot\n");
-
# This tells the test driver that the perl test script executed properly.
1;
-
-### Local Variables:
-### eval: (setq whitespace-action (delq 'auto-cleanup whitespace-action))
-### End:

2
srcpkgs/make/template
View File

@ -1,7 +1,7 @@
# Template build file for 'make'
pkgname=make
version=4.2
revision=2
revision=3
bootstrap=yes
build_style=gnu-configure
configure_args="--without-guile"