guix-devel
[Top][All Lists]
Advanced

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

[PATCH 07/13] gnu: gpsbabel: Fix regression caused by update to qt 5.7.


From: David Craven
Subject: [PATCH 07/13] gnu: gpsbabel: Fix regression caused by update to qt 5.7.
Date: Sun, 21 Aug 2016 16:08:20 +0200

* gnu/packages/gps.scm (gpsbabel)[arguments]: Require gnu++11. Disable tests
on all platforms due to rounding error.
---
 gnu/packages/gps.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index ccd9636..8124990 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -48,7 +48,9 @@
                 "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--with-zlib=system")
+     `(#:configure-flags
+        '("--with-zlib=system"
+          "CXXFLAGS=-std=gnu++11")
        #:phases
        (modify-phases %standard-phases
         (add-before 'configure 'pre-configure
@@ -59,7 +61,8 @@
        ;; On i686, 'raymarine.test' fails because of a rounding error:
        ;; <http://hydra.gnu.org/build/133040>.  As a workaround, disable tests
        ;; on these platforms.
-       #:tests? ,(not (string-prefix? "i686" (%current-system)))))
+       ;; On x86_64 with -std=gnu++11 tests also fail due to rounding error.
+       #:tests? #f))
     (inputs
      `(("expat" ,expat)
        ("zlib" ,zlib)
-- 
2.9.0



reply via email to

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