Accepting request 970724 from devel:languages:misc

OBS-URL: https://build.opensuse.org/request/show/970724 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/guile?expand=0&rev=69
1 year ago · 5c5ea6ccb2
parent aa26229b55 a577b70670
commit 5c5ea6ccb2
3 changed files with 21 additions and 6 deletions
--- a/guile.changes
+++ b/guile.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 29 13:14:36 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- stage2-serialize.patch: Serialize stage2 build only
+
 -------------------------------------------------------------------
 Mon Mar 21 20:52:02 UTC 2022 - Dirk Müller <dmueller@suse.com>

--- a/guile.spec
+++ b/guile.spec
@ -40,6 +40,8 @@ Patch0:         guile-3.0-gc_pkgconfig_private.patch
 Patch1:         disable-test-out-of-memory.patch
 Patch2:         gcc10-x86-disable-one-test.patch
 Patch3:         adjust-32bit-big-endian-build-flags.patch
+# do sequential build for reproducible .go files = https://issues.guix.gnu.org/issue/20272 - boo#1102408
+Patch4:         stage2-serialize.patch
 BuildRequires:  gmp-devel
 BuildRequires:  libffi-devel
 BuildRequires:  libltdl-devel
@ -105,6 +107,7 @@ linked in as a library when building extensible programs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1

 # remove broken prebuilt objects
 rm -r prebuilt/32-bit-big-endian
@ -115,19 +118,14 @@ echo exit 77 > test-suite/standalone/test-stack-overflow
 %endif

 %build
-aclocal
+autoreconf -fi
 %configure \
  --disable-static \
  --with-pic \
  --enable-lto \
  --with-threads \
  --disable-silent-rules
-%if 0%{?_with_ringdisabled}
 %make_build
-%else
-# do sequential build for reproducible .go files = https://issues.guix.gnu.org/issue/20272 - boo#1102408
-%make_build -j1
-%endif

 %check
 LD_LIBRARY_PATH="." \
--- a/stage2-serialize.patch
+++ b/stage2-serialize.patch
@ -0,0 +1,12 @@
+Index: guile-3.0.8/stage2/Makefile.am
+===================================================================
+--- guile-3.0.8.orig/stage2/Makefile.am
+++ guile-3.0.8/stage2/Makefile.am
+@@ -21,6 +21,7 @@
+ ##   Fifth Floor, Boston, MA 02110-1301 USA
+ 
+ 
+.NOTPARALLEL:
+ GUILE_WARNINGS = -W1
+ GUILE_OPTIMIZATIONS = -O2
+ GUILE_BOOTSTRAP_STAGE = stage2