| author | Jesse Butler <jesse.butler@oracle.com> |
| Fri, 29 Jul 2016 11:50:34 -0700 | |
| changeset 6527 | 106e3067f7cc |
| parent 1605 | 7fc7910b6d94 |
| permissions | -rw-r--r-- |
|
1605
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
gcc 4.7 breaks guile 1.8.6 |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
Upstream bug is: http://savannah.gnu.org/bugs/?29583 |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
bug #29583: gcc 4.5 breaks guile 1.8.7 |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
fix doc snarfing with fedora 12 |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
* module/scripts/snarf-check-and-output-texi.scm |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
(process-multiline-directive): Be more accepting of source location |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
markers in the preprocessed source, by adding a couple cases in which |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
they can appear. Not foolproof, but it does adapt to what new GCCs are |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
putting out (e.g. cpp (GCC) 4.4.2 20091222 (Red Hat 4.4.2-20)). |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
--- guile-1.8.4/scripts/snarf-check-and-output-texi.orig 2013-12-17 08:05:14.466575700 -0800 |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+++ guile-1.8.4/scripts/snarf-check-and-output-texi 2013-12-17 08:06:34.623311834 -0800 |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
@@ -267,6 +267,17 @@ |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
(set! *file* file) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
(set! *line* line)) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
+ ;; newer gccs like to throw around more location markers into the |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+ ;; preprocessed source; these (hash . hash) bits are what they translate to |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+ ;; in snarfy terms. |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+ (('location ('string . file) ('int . line) ('hash . 'hash))
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
+ (set! *file* file) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
+ (set! *line* line)) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
+ |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
+ (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash))
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
+ (set! *file* file) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
+ (set! *line* line)) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+ |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
(('arglist rest ...)
|
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
(set! *args* (do-arglist rest))) |
|
7fc7910b6d94
17389830 guile fails to build with gcc4.7
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |