| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 02 May 2017 08:26:02 -0700 | |
| changeset 7960 | 80539200ddb3 |
| parent 6090 | 32b4c33eb722 |
| permissions | -rw-r--r-- |
|
6090
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Make sure that we always use /usr/gnu/bin/m4 rather than what is available |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
via the M4 environment variable or what's in the PATH environment variable. |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
7960
80539200ddb3
25788891 Update flex to version 2.6.3
Rich Burridge <rich.burridge@oracle.com>
parents:
6090
diff
changeset
|
4 |
This change has been sent upstream. See email thread starting at: |
|
6090
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
https://sourceforge.net/p/flex/mailman/message/35103749/ |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
|
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
--- flex-2.6.1/src/main.c.orig 2016-05-19 14:36:18.569346881 -0700 |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
+++ flex-2.6.1/src/main.c 2016-05-20 07:59:04.169569771 -0700 |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
@@ -348,6 +348,7 @@ |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
|
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
/* Setup the filter chain. */ |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
output_chain = filter_create_int(NULL, filter_tee_header, headerfilename); |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+#ifndef __sun |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
if ( !(m4 = getenv("M4"))) {
|
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
char *slash; |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
m4 = M4; |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
@@ -389,6 +390,9 @@ |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
} |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
} |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
filter_create_ext(output_chain, m4, "-P", 0); |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+#else |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+ filter_create_ext(output_chain, "/usr/gnu/bin/m4", "-P", 0); |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
+#endif |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
filter_create_int(output_chain, filter_fix_linedirs, NULL); |
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
|
|
32b4c33eb722
PSARC 2016/309 flex version 2.6.1
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
/* For debugging, only run the requested number of filters. */ |