From 3b2fdfdcfb2bb028ef7d21ceb950f461e712c2873c975f48ba6913572d5ffe8c Mon Sep 17 00:00:00 2001
From: Jonathan Brielmaier <jbrielmaier@opensuse.org>
Date: Sun, 22 Mar 2020 17:43:34 +0000
Subject: [PATCH] Accepting request 787297 from home:jbrielmaier:guile-3.0

- Add patch from upstream to fix build of Guix with more then two threads:
  * guile-3.0-fix-compile-crash.patch

OBS-URL: https://build.opensuse.org/request/show/787297
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=111
---
 guile-3.0-fix-compile-crash.patch | 39 +++++++++++++++++++++++++++++++
 guile.changes                     |  6 +++++
 guile.spec                        |  3 +++
 3 files changed, 48 insertions(+)
 create mode 100644 guile-3.0-fix-compile-crash.patch

diff --git a/guile-3.0-fix-compile-crash.patch b/guile-3.0-fix-compile-crash.patch
new file mode 100644
index 0000000..8204d6e
--- /dev/null
+++ b/guile-3.0-fix-compile-crash.patch
@@ -0,0 +1,39 @@
+From 7c17655cd3d859bf0c5a86d9782a7788205fc05a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
+Date: Mon, 9 Mar 2020 15:09:26 +0100
+Subject: Fix incorrect allocation size in 'make-vtable-vtable'.
+
+Fixes <https://bugs.gnu.org/39266>.
+Thanks to <https://rr-project.org/> for its help!
+
+* libguile/struct.c (set_vtable_access_fields): Fix first argument to
+'scm_gc_malloc_pointerless'.
+---
+ libguile/struct.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/libguile/struct.c b/libguile/struct.c
+index 3dbcc71d4..68dcc0070 100644
+--- a/libguile/struct.c
++++ b/libguile/struct.c
+@@ -1,4 +1,4 @@
+-/* Copyright 1996-2001,2003-2004,2006-2013,2015,2017-2018
++/* Copyright 1996-2001,2003-2004,2006-2013,2015,2017-2018,2020
+      Free Software Foundation, Inc.
+ 
+    This file is part of Guile.
+@@ -139,8 +139,10 @@ set_vtable_access_fields (SCM vtable)
+   nfields = len / 2;
+ 
+   bitmask_size = (nfields + 31U) / 32U;
+-  unboxed_fields = scm_gc_malloc_pointerless (bitmask_size, "unboxed fields");
+-  memset (unboxed_fields, 0, bitmask_size * sizeof(*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.  */
+   for (field = 0; field < nfields; field++)
+-- 
+cgit v1.2.1
diff --git a/guile.changes b/guile.changes
index 900bd40..73515d3 100644
--- a/guile.changes
+++ b/guile.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Mar 22 15:03:51 UTC 2020 - Jonathan Brielmaier <jbrielmaier@opensuse.org>
+
+- Add patch from upstream to fix build of Guix with more then two threads:
+  * guile-3.0-fix-compile-crash.patch 
+
 -------------------------------------------------------------------
 Mon Mar  9 10:21:27 UTC 2020 - Jonathan Brielmaier <jbrielmaier@suse.de>
 
diff --git a/guile.spec b/guile.spec
index 9a473c6..5ac5fad 100644
--- a/guile.spec
+++ b/guile.spec
@@ -37,6 +37,8 @@ Source3:        guile-rpmlintrc
 Patch0:         guile-3.0-gc_pkgconfig_private.patch
 # The out-of-memory test is flaky, so disable it
 Patch1:         disable-test-out-of-memory.patch
+# PATCH-FIX-UPSTREAM -- 7c17655 fix building Guix with more then two threads
+Patch2:         guile-3.0-fix-compile-crash.patch
 BuildRequires:  gmp-devel
 BuildRequires:  libffi-devel
 BuildRequires:  libltdl-devel
@@ -102,6 +104,7 @@ linked in as a library when building extensible programs.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # remove broken prebuilt objects
 rm -r prebuilt/32-bit-big-endian