| author | mmhunter@s11sru-x01.us.oracle.com |
| Tue, 07 May 2013 10:23:59 -0700 | |
| branch | s11u1-sru |
| changeset 2610 | 37b9db3f8401 |
| 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 submitted upstream as: |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
2 |
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
3 |
bug #36106: make target-specific variables fail if over 150 characters and contain semicolon |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
4 |
http://savannah.gnu.org/bugs/index.php?36106 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
5 |
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
6 |
--- a/read.c 2010-07-13 03:20:42.000000000 +0200 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
7 |
+++ b/read.c 2012-04-05 23:25:12.155011371 +0200 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
8 |
@@ -1071,12 +1071,12 @@ |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
9 |
after it. */ |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
10 |
if (semip) |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
11 |
{
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
12 |
- unsigned int l = p - variable_buffer; |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
13 |
+ unsigned int l = p2 - variable_buffer; |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
14 |
*(--semip) = ';'; |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
15 |
collapse_continuations (semip); |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
16 |
variable_buffer_output (p2 + strlen (p2), |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
17 |
semip, strlen (semip)+1); |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
18 |
- p = variable_buffer + l; |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
19 |
+ p2 = variable_buffer + l; |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
20 |
} |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
21 |
record_target_var (filenames, p2, |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
22 |
vmod.override_v ? o_override : o_file, |