guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: gd: Fix test failure on aarch64.


From: Efraim Flashner
Subject: 01/01: gnu: gd: Fix test failure on aarch64.
Date: Wed, 1 Mar 2017 15:23:37 -0500 (EST)

efraim pushed a commit to branch core-updates
in repository guix.

commit 7ed7be3c2e11f78ccfa2e123f63c522c4b902f97
Author: Efraim Flashner <address@hidden>
Date:   Wed Mar 1 22:17:23 2017 +0200

    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.
---
 gnu/packages/gd.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 8cac242..ea13540 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
 ;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]