pyrox.dev
lol
GNU Guile 1.8: Fix builds with GCC 4.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22369
+28
+24
pkgs/development/interpreters/guile/cpp-4.5.patch
+24
pkgs/development/interpreters/guile/cpp-4.5.patch
···
1
+
Fix doc snarfing with GCC 4.5.
2
+
From <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=aac41d28358cea594bb30f6e547afb82bb6004a6>.
3
+
4
+
diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi
5
+
index ea33e17..8cd42e8 100755
6
+
--- a/scripts/snarf-check-and-output-texi
7
+
+++ b/scripts/snarf-check-and-output-texi
8
+
@@ -267,6 +267,17 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
9
+
(set! *file* file)
10
+
(set! *line* line))
11
+
12
+
+ ;; newer gccs like to throw around more location markers into the
13
+
+ ;; preprocessed source; these (hash . hash) bits are what they translate to
14
+
+ ;; in snarfy terms.
15
+
+ (('location ('string . file) ('int . line) ('hash . 'hash))
16
+
+ (set! *file* file)
17
+
+ (set! *line* line))
18
+
+
19
+
+ (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash))
20
+
+ (set! *file* file)
21
+
+ (set! *line* line))
22
+
+
23
+
(('arglist rest ...)
24
+
(set! *args* (do-arglist rest)))
+4
pkgs/development/interpreters/guile/default.nix
+4
pkgs/development/interpreters/guile/default.nix
···
9
9
sha256 = "1czhcrn6l63xhsw3fjmv88djflqxbdpxjhgmwwvscm8rv4wn7vmz";
10
10
};
11
11
12
+
patches = [ ./cpp-4.5.patch ];
13
+
12
14
buildNativeInputs = [ makeWrapper gawk ];
13
15
propagatedBuildInputs = [ readline gmp libtool ];
14
16
selfBuildNativeInput = true;
···
31
33
32
34
# One test fails.
33
35
# ERROR: file: "libtest-asmobs", message: "file not found"
36
+
# This is fixed here:
37
+
# <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
34
38
doCheck = false;
35
39
36
40
setupHook = ./setup-hook.sh;