diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-12-27 17:17:37 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-12-27 17:17:37 -0300 |
| commit | 0c14c3dd36e1c2f529ffa248383a275cfb21f168 (patch) | |
| tree | f844a262139ed9aadefa9707776794927a12b1de /~lukeshu/make-graph/make-3.82-makeflags.patch | |
| parent | b24bcd7ea54466fae5136027d6b5bd9fb3741012 (diff) | |
| parent | cdb44f3dc8b59a656b0dc5568d731bdcb7c9ff60 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Diffstat (limited to '~lukeshu/make-graph/make-3.82-makeflags.patch')
| -rw-r--r-- | ~lukeshu/make-graph/make-3.82-makeflags.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/~lukeshu/make-graph/make-3.82-makeflags.patch b/~lukeshu/make-graph/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); |