author | John Beck <John.Beck@Oracle.COM> |
Mon, 06 Oct 2014 11:36:29 -0700 | |
branch | s11-update |
changeset 3369 | d159dcb97df2 |
parent 770 | f112e7923000 |
permissions | -rw-r--r-- |
770
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
1 |
This patch is taken from: |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
2 |
http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.246&r2=1.247 |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
3 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
4 |
When we re-exec the master makefile in a jobserver environment, ensure |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
5 |
that MAKEFLAGS is set properly so the re-exec'd make runs in parallel. |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
6 |
See Savannah bug #33873. |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
7 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
8 |
bug #33873: MAKEFLAGS=-jN gets lost on reexec |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
9 |
https://savannah.gnu.org/bugs/?33873 |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
10 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
11 |
sr #107487: MAKEFLAGS not being honored always (regression) in 3.82 |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
12 |
https://savannah.gnu.org/support/index.php?107487 |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
13 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
14 |
--- a/main.c 2010/08/29 23:05:27 1.246 |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
15 |
+++ b/main.c 2011/09/18 23:39:26 1.247 |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
16 |
@@ -2088,6 +2088,11 @@ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
17 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
18 |
++restarts; |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
19 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
20 |
+ /* If we're re-exec'ing the first make, put back the number of |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
21 |
+ job slots so define_makefiles() will get it right. */ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
22 |
+ if (master_job_slots) |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
23 |
+ job_slots = master_job_slots; |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
24 |
+ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
25 |
/* Reset makeflags in case they were changed. */ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
26 |
{ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
27 |
const char *pv = define_makeflags (1, 1); |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
28 |
@@ -2824,9 +2829,6 @@ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
29 |
&& (*(unsigned int *) cs->value_ptr == |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
30 |
*(unsigned int *) cs->noarg_value)) |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
31 |
ADD_FLAG ("", 0); /* Optional value omitted; see below. */ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
32 |
- else if (cs->c == 'j') |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
33 |
- /* Special case for `-j'. */ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
34 |
- ADD_FLAG ("1", 1); |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
35 |
else |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
36 |
{ |
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
37 |
char *buf = alloca (30); |