diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
| commit | b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60 (patch) | |
| tree | 707c6a5e18474b410e39fa6892521c9f47518ccc /gnu/packages/gps.scm | |
| parent | 97127431ee9133626fea62449706d729d80b73f6 (diff) | |
| parent | 5b63a8568b39c019970569773bace18fab17a157 (diff) | |
| download | guix-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar guix-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/gps.scm')
| -rw-r--r-- | gnu/packages/gps.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index ccd9636ea0..da5485e6ee 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,9 @@ ;; 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))))) + ;; FIXME: On x86_64 with -std=gnu++11 tests also fail due to rounding + ;; error. + #:tests? #f)) (inputs `(("expat" ,expat) ("zlib" ,zlib) |