branch core-updates updated: guile: Leave 'scm_install_gmp_memory_functions' unchanged.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new d92ee0a  guile: Leave 'scm_install_gmp_memory_functions' unchanged.
d92ee0a is described below

commit d92ee0a8bdc324726e737bf4ef099d75724ce8c9
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue May 25 22:01:38 2021 +0200

    guile: Leave 'scm_install_gmp_memory_functions' unchanged.
    
    Since the switch to Guile 3.0.7 using mini-GMP, we can leave
    'scm_install_gmp_memory_functions' to its default value, which is to use
    custom memory allocators; there is no interference with users of GMP
    such as GnuTLS/Nettle.
    
    * gnu/packages/aux-files/guile-launcher.c (main) [!SCM_ENABLE_MINI_GMP]:
    Leave 'scm_install_gmp_memory_functions' unchanged.
---
 gnu/packages/aux-files/guile-launcher.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/aux-files/guile-launcher.c 
b/gnu/packages/aux-files/guile-launcher.c
index 47ba069..ad0094b 100644
--- a/gnu/packages/aux-files/guile-launcher.c
+++ b/gnu/packages/aux-files/guile-launcher.c
@@ -82,10 +82,13 @@ main (int argc, char **argv)
   unsetenv ("GUILE_LOAD_PATH");
   unsetenv ("GUILE_LOAD_COMPILED_PATH");
 
-  /* XXX: Do not let GMP allocate via libgc as this can lead to memory
-     corruption in GnuTLS/Nettle since Nettle also uses GMP:
+#if !SCM_ENABLE_MINI_GMP
+  /* XXX: On Guile < 3.0.6 and Guile built without its bundled mini-GMP, do
+     not let GMP allocate via libgc as this can lead to memory corruption in
+     GnuTLS/Nettle since Nettle also uses GMP:
      <https://issues.guix.gnu.org/46330>.  */
   scm_install_gmp_memory_functions = 0;
+#endif
 
   scm_boot_guile (argc, argv, inner_main, 0);
   return 0; /* never reached */