Commit dcd1fb95 authored by Rico Tzschichholz's avatar Rico Tzschichholz

apps-3.14: Bump guile to 2.0.11

parent efdeede0
......@@ -176,10 +176,10 @@
<autotools id="guile">
<pkg-config>guile-2.0.pc</pkg-config>
<branch repo="ftp.gnu.org"
module="guile/guile-2.0.7.tar.xz"
version="2.0.7"
hash="sha256:6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338"
size="4396724"/>
module="guile/guile-2.0.11.tar.xz"
version="2.0.11"
hash="sha256:aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2"
size="4634060"/>
<dependencies>
<dep package="libunistring"/>
<dep package="gc"/>
......
From 445f31fc06d338f0cafda188d0287f935c2edc3c Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@oblong.net>
Date: Sun, 17 Jan 2010 17:22:51 +0000
Subject: fix doc snarfing with fedora 12
* module/scripts/snarf-check-and-output-texi.scm
(process-multiline-directive): Be more accepting of source location
markers in the preprocessed source, by adding a couple cases in which
they can appear. Not foolproof, but it does adapt to what new GCCs are
putting out (e.g. cpp (GCC) 4.4.2 20091222 (Red Hat 4.4.2-20)).
---
diff --git a/module/scripts/snarf-check-and-output-texi b/module/scripts/snarf-check-and-output-texi
index 0e7efae..f92c833 100644
--- a/module/scripts/snarf-check-and-output-texi
+++ b/module/scripts/snarf-check-and-output-texi
@@ -262,6 +262,17 @@
(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)))
--
cgit v0.8.3.2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment