Commit b6415329 authored by Frederic Peters's avatar Frederic Peters

[bootstrap] patch to build guile with libtool 2 (GNOME bug 583838)

parent ede6affa
......@@ -102,7 +102,9 @@
<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"/>
size="3933369" md5sum="a3f8216544509a74a4441f689a0410d2">
<patch file="guile-1.8.5-libtool2.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gmp"/>
</dependencies>
......
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 \
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