From fccc0275091af10a46471c68df525d19f446af9e Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 20 Jul 2021 23:34:17 +0200 Subject: [PATCH] gnu: guile: Fix failing tests on IA32. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/guile.scm (guile-3.0)[arguments]<#:configure-flags>: Add "-fexcess-precision=standard" to CFLAGS when (target-x86-32?) is true. Signed-off-by: Ludovic Courtès --- gnu/packages/guile.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d78c57e88c..86621e4ca0 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Taylan Kammer ;;; Copyright © 2020, 2021 Efraim Flashner +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -316,11 +317,19 @@ without requiring the source code to be rewritten.") (arguments (substitute-keyword-arguments (package-arguments guile-2.2) ((#:configure-flags flags ''()) - (let ((flags `(cons "--enable-mini-gmp" ,flags))) - ;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd. - (if (hurd-target?) - `(cons "--disable-jit" ,flags) - flags))) + ;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd. + `(cons* ,@(if (hurd-target?) + '("--disable-jit") + '()) + ;; -fexcess-precision=standard is required when compiling for + ;; i686-linux, otherwise "numbers.test" will fail + ;; (see and + ;; ). + ,@(if (target-x86-32?) + '("CFLAGS=-g -O2 -fexcess-precision=standard") + '()) + "--enable-mini-gmp" + ,flags)) ((#:phases phases) `(modify-phases ,phases (add-before 'check 'disable-stack-overflow-test