Elinks: Fix libgc initialization.

svn path=/nixpkgs/trunk/; revision=27046
This commit is contained in:
Ludovic Courtès 2011-04-28 21:22:24 +00:00
parent 163c51f299
commit 270ea3beec
2 changed files with 20 additions and 1 deletions

View File

@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
};
patches = [ ./gc-init.patch ];
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ];
configureFlags =
''
--enable-finger --enable-html-highlight --with-guile

View File

@ -0,0 +1,17 @@
Fix libgc initialization in the presence of Guile 2.0.
--- elinks-0.12pre5/src/main/main.c 2009-07-07 14:23:17.000000000 +0200
+++ elinks-0.12pre5/src/main/main.c 2011-04-28 23:20:15.000000000 +0200
@@ -339,6 +339,11 @@ int
main(int argc, char *argv[])
{
#ifdef CONFIG_GC
+ /* Guile 2.x uses libgc too and it initializes it this way, so we
+ * must make sure to initialize it the same way, or it will just
+ * segfault. */
+ GC_all_interior_pointers = 0;
+
GC_INIT();
GC_set_warn_proc(gc_warning);
#endif