summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2014-04-25 19:05:35 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2014-04-25 19:05:35 +0000
commitbaf2c20edfd9b12010d0897c33005e1fb3dd0cc1 (patch)
tree2a7850059bce32e03d754a79ecef025fecd34215 /net-libs/gnutls/files
parentDrop old (diff)
downloadgentoo-2-baf2c20edfd9b12010d0897c33005e1fb3dd0cc1.tar.gz
gentoo-2-baf2c20edfd9b12010d0897c33005e1fb3dd0cc1.tar.bz2
gentoo-2-baf2c20edfd9b12010d0897c33005e1fb3dd0cc1.zip
Fix guile build, bug#508454, thanks to Ed Catmur
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'net-libs/gnutls/files')
-rw-r--r--net-libs/gnutls/files/gnutls-3.3.1-guile.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/net-libs/gnutls/files/gnutls-3.3.1-guile.patch b/net-libs/gnutls/files/gnutls-3.3.1-guile.patch
new file mode 100644
index 000000000000..e0cf96af54c4
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.3.1-guile.patch
@@ -0,0 +1,30 @@
+From 872409857351f28b1e3c21526bfa6606c918b176 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sat, 19 Apr 2014 15:04:54 +0200
+Subject: [PATCH] do not override gnutls' allocation functions
+
+That was not being done using the API, and overriding them
+is no longer possible in 3.3.x.
+---
+ guile/src/core.c | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/guile/src/core.c b/guile/src/core.c
+index 6940eae..b40e93e 100644
+--- a/guile/src/core.c
++++ b/guile/src/core.c
+@@ -3364,11 +3364,6 @@ scm_init_gnutls (void)
+ #include "core.x"
+
+ /* Use Guile's allocation routines, which will run the GC if need be. */
+- gnutls_malloc = scm_malloc;
+- gnutls_realloc = scm_realloc;
+- gnutls_secure_malloc = scm_malloc;
+- gnutls_free = free;
+-
+ (void) gnutls_global_init ();
+
+ scm_gnutls_define_enums ();
+--
+1.7.1
+