Commit 83179b20 authored by Craig Keogh's avatar Craig Keogh

[bootstrap] Bump guile to 1.8.7 & patch (GNOME bug 636921)

parent 4e641e34
......@@ -82,10 +82,16 @@
</tarball>
<autotools id="guile" autogenargs="--enable-error-on-warning=no">
<branch repo="ftp.gnu.org" module="guile/guile-1.8.5.tar.gz"
version="1.8.5"
size="3933369" md5sum="a3f8216544509a74a4441f689a0410d2">
<patch file="guile-1.8.5-libtool2.patch" strip="1"/>
<branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
version="1.8.7"
hash="sha1:24cd2f06439c76d41d982a7384fe8a0fe5313b54"
md5sum="991b5b3efcbbc3f7507d05bc42f80a5e"
size="4026804">
<!-- Patch to build with gcc 4.5. http://savannah.gnu.org/bugs/?29583
Remove when 1.8.8 released. Patch from:
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=445f31fc06d338f0cafda188d0287f935c2edc3c
-->
<patch file="guile-1.8.7-445f31fc06.patch" strip="2"/>
</branch>
<dependencies>
<dep package="gmp"/>
......
commit de7d32d064f2178c41dc98540ec5822a286107ae
Author: Ludovic Court猫s <ludo@gnu.org>
Date: Sun Dec 7 22:01:50 2008 +0100
Remove useless references to Libtool's `dlpreopen' mechanism.
* libguile/Makefile.am (guile_LDFLAGS): Remove `@DLPREOPEN@' since it
has no effect.
* libguile/guile.c (main): Don't invoke `LTDL_SET_PRELOADED_SYMBOLS ()'
since it had no effect given how we invoke `libtool'. It also fixes
compatibility issues when using libltdl 1.5 with a Libtool 2.2
package.
(+ Makefile.am change applied to Makefile.in)
diff -Naur guile-1.8.5.orig/libguile/guile.c guile-1.8.5/libguile/guile.c
--- guile-1.8.5.orig/libguile/guile.c 2008-04-07 23:30:03.000000000 +0200
+++ guile-1.8.5/libguile/guile.c 2009-05-26 09:56:45.015882249 +0200
@@ -66,11 +66,6 @@
int
main (int argc, char **argv)
{
-#if !defined (__MINGW32__)
- /* libtool automagically inserts this variable into your executable... */
- extern const lt_dlsymlist lt_preloaded_symbols[];
- lt_dlpreload_default (lt_preloaded_symbols);
-#endif
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}
diff -Naur guile-1.8.5.orig/libguile/Makefile.am guile-1.8.5/libguile/Makefile.am
--- guile-1.8.5.orig/libguile/Makefile.am 2008-05-04 23:39:47.000000000 +0200
+++ guile-1.8.5/libguile/Makefile.am 2009-05-26 09:56:00.893883560 +0200
@@ -94,7 +94,7 @@
guile_SOURCES = guile.c
guile_CFLAGS = $(GUILE_CFLAGS)
guile_LDADD = libguile.la
-guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS)
+guile_LDFLAGS = $(GUILE_CFLAGS)
libguile_la_CFLAGS = $(GUILE_CFLAGS)
diff -Naur guile-1.8.5.orig/libguile/Makefile.in guile-1.8.5/libguile/Makefile.in
--- guile-1.8.5.orig/libguile/Makefile.in 2008-05-07 20:08:34.000000000 +0200
+++ guile-1.8.5/libguile/Makefile.in 2009-05-26 09:58:39.045883219 +0200
@@ -384,7 +385,7 @@
guile_SOURCES = guile.c
guile_CFLAGS = $(GUILE_CFLAGS)
guile_LDADD = libguile.la
-guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS)
+guile_LDFLAGS = $(GUILE_CFLAGS)
libguile_la_CFLAGS = $(GUILE_CFLAGS)
libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
chars.c continuations.c convert.c debug.c deprecation.c \
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