me
/
guix
Archived
1
0
Fork 0

gnu: guile@2.0: Build with '-fexcess-precision=standard' on i686.

Fixes <https://issues.guix.gnu.org/53462>.
Reported by Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>.

This is a followup to 9b09a753a9.

* gnu/packages/guile.scm (guile-2.0)[arguments]: Augment #:configure-flags
when 'target-x86-32?'.
(guile-2.2)[arguments]: Tweak #:configure-flags to keep derivation unchanged.
(guile-3.0)[arguments]: Likewise.
master
Ludovic Courtès 2022-01-24 14:18:08 +01:00
parent 1bfd634e33
commit c9627323ec
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 3 deletions

View File

@ -187,7 +187,10 @@ without requiring the source code to be rewritten.")
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments
`(#:configure-flags '("--disable-static") ; saves 3 MiB `(#:configure-flags
,(if (target-x86-32?) ;<https://issues.guix.gnu.org/49368>
''("--disable-static" "CFLAGS=-g -O2 -fexcess-precision=standard")
''("--disable-static")) ;saves 3 MiB
;; Work around non-reproducible .go files as described in ;; Work around non-reproducible .go files as described in
;; <https://bugs.gnu.org/20272>, which affects 2.0, 2.2, and 3.0 so far. ;; <https://bugs.gnu.org/20272>, which affects 2.0, 2.2, and 3.0 so far.
@ -273,7 +276,8 @@ without requiring the source code to be rewritten.")
(substitute-keyword-arguments (package-arguments guile-2.0) (substitute-keyword-arguments (package-arguments guile-2.0)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
(if (target-x86-32?) ;<https://issues.guix.gnu.org/49368> (if (target-x86-32?) ;<https://issues.guix.gnu.org/49368>
`(append ,flags '("CFLAGS=-g -O2 -fexcess-precision=standard")) `(append '("--disable-static")
'("CFLAGS=-g -O2 -fexcess-precision=standard"))
flags)))) flags))))
(properties '((timeout . 72000) ;20 hours (properties '((timeout . 72000) ;20 hours
@ -345,7 +349,7 @@ without requiring the source code to be rewritten.")
'("CFLAGS=-g -O2 -fexcess-precision=standard") '("CFLAGS=-g -O2 -fexcess-precision=standard")
'()) '())
"--enable-mini-gmp" "--enable-mini-gmp"
,flags)) '("--disable-static")))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'check 'disable-stack-overflow-test (add-before 'check 'disable-stack-overflow-test