Author: ludo Date: 2010-06-22 08:06:12 +0000 (Tue, 22 Jun 2010) New Revision: 22369
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22369&view=rev Added: nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/cpp-4.5.patch Modified: nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/default.nix Log: GNU Guile 1.8: Fix builds with GCC 4.5. Changes: Added: nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/cpp-4.5.patch =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/cpp-4.5.patch (rev 0) +++ nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/cpp-4.5.patch 2010-06-22 08:06:12 UTC (rev 22369) @@ -0,0 +1,24 @@ +Fix doc snarfing with GCC 4.5. +From <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=aac41d28358cea594bb30f6e547afb82bb6004a6>. + +diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi +index ea33e17..8cd42e8 100755 +--- a/scripts/snarf-check-and-output-texi ++++ b/scripts/snarf-check-and-output-texi +@@ -267,6 +267,17 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" + (set! *file* file) + (set! *line* line)) + ++ ;; newer gccs like to throw around more location markers into the ++ ;; preprocessed source; these (hash . hash) bits are what they translate to ++ ;; in snarfy terms. ++ (('location ('string . file) ('int . line) ('hash . 'hash)) ++ (set! *file* file) ++ (set! *line* line)) ++ ++ (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash)) ++ (set! *file* file) ++ (set! *line* line)) ++ + (('arglist rest ...) + (set! *args* (do-arglist rest))) Modified: nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/default.nix 2010-06-21 23:48:25 UTC (rev 22368) +++ nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/guile/default.nix 2010-06-22 08:06:12 UTC (rev 22369) @@ -9,6 +9,8 @@ sha256 = "1czhcrn6l63xhsw3fjmv88djflqxbdpxjhgmwwvscm8rv4wn7vmz"; }; + patches = [ ./cpp-4.5.patch ]; + buildNativeInputs = [ makeWrapper gawk ]; propagatedBuildInputs = [ readline gmp libtool ]; selfBuildNativeInput = true; @@ -31,6 +33,8 @@ # One test fails. # ERROR: file: "libtest-asmobs", message: "file not found" + # This is fixed here: + # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>. doCheck = false; setupHook = ./setup-hook.sh; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
