gnu: guile-next: Update to 3.0.1 with bug-fix for crash.
* gnu/packages/guile.scm (guile-3.0): Update to 3.0.1 with "guile-3.0-crash.patch". * gnu/packages/patches/guile-3.0-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Use it.master
parent
0e20e2c387
commit
98619142b8
|
@ -977,6 +977,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
%D%/packages/patches/guile-2.2-default-utf8.patch \
|
||||
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
|
||||
%D%/packages/patches/guile-3.0-crash.patch \
|
||||
%D%/packages/patches/guile-default-utf8.patch \
|
||||
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
|
||||
%D%/packages/patches/guile-linux-syscalls.patch \
|
||||
|
|
|
@ -292,14 +292,18 @@ without requiring the source code to be rewritten.")
|
|||
(package
|
||||
(inherit guile-2.2)
|
||||
(name "guile-next") ;to be renamed to "guile"
|
||||
(version "3.0.0")
|
||||
(version "3.0.1")
|
||||
(source (origin
|
||||
(inherit (package-source guile-2.2))
|
||||
(uri (string-append "mirror://gnu/guile/guile-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9"))))
|
||||
"1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn"))
|
||||
(patches
|
||||
(append (search-patches "guile-3.0-crash.patch")
|
||||
(origin-patches (package-source guile-2.2))))))
|
||||
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments guile-2.2)
|
||||
;; XXX: On ARMv7, work around <https://bugs.gnu.org/39208> by disabling
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
Fix crash due to: <https://issues.guix.gnu.org/issue/39266>.
|
||||
|
||||
diff --git a/libguile/struct.c b/libguile/struct.c
|
||||
index 3dbcc71d4..ddcbe46d2 100644
|
||||
--- a/libguile/struct.c
|
||||
+++ b/libguile/struct.c
|
||||
@@ -139,7 +139,9 @@ set_vtable_access_fields (SCM vtable)
|
||||
nfields = len / 2;
|
||||
|
||||
bitmask_size = (nfields + 31U) / 32U;
|
||||
- unboxed_fields = scm_gc_malloc_pointerless (bitmask_size, "unboxed fields");
|
||||
+ unboxed_fields =
|
||||
+ scm_gc_malloc_pointerless (bitmask_size * sizeof (*unboxed_fields),
|
||||
+ "unboxed fields");
|
||||
memset (unboxed_fields, 0, bitmask_size * sizeof(*unboxed_fields));
|
||||
|
||||
/* Update FLAGS according to LAYOUT. */
|
Reference in New Issue