summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-03-01 22:17:23 +0200
committerEfraim Flashner <efraim@flashner.co.il>2017-03-01 22:17:58 +0200
commit7ed7be3c2e11f78ccfa2e123f63c522c4b902f97 (patch)
tree90e17dda63f774d73decc4da906065ff674ed83a
parentf3a24b46c82f6a8e9f2638cbfe01f70abc4de04f (diff)
downloadguix-7ed7be3c2e11f78ccfa2e123f63c522c4b902f97.tar.gz
gnu: gd: Fix test failure on aarch64.
* gnu/packages/gd.scm (gd)[arguments]: Add make-flag -ffp-contract=off
to work around upstream bug 278.
-rw-r--r--gnu/packages/gd.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 8cac242b5d..ea13540415 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,7 +56,10 @@
                                       "gd-freetype-test-failure.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+      ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding
+      ;; issues on aarch64 and other architectures.
+     `(#:make-flags '("CFLAGS=-ffp-contract=off")
+       #:phases
        (modify-phases %standard-phases
          ;; This test is known to fail on i686-linux:
          ;; https://github.com/libgd/libgd/issues/359
@@ -64,7 +68,8 @@
            (lambda _
              (substitute* "tests/gdimagegrayscale/basic.c"
                (("return gdNumFailures\\(\\)")
-                 "return 0")))))))
+                 "return 0"))
+             #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs