diff options
author | Marius Bakke <marius@gnu.org> | 2022-09-01 23:07:33 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-09-01 23:07:33 +0200 |
commit | 0c518f974e64f23846ae51ea2c68b479202fdca9 (patch) | |
tree | f7052c4adfc0d3c77b41652cf4f1e4b2e594d02c /gnu/packages/graphics.scm | |
parent | a38889b14d74e31c1b74c55d020445b760516c5d (diff) | |
parent | 4d361a6b5147e3f91573e9d3c8c540a233e7e142 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/graphics.scm')
-rw-r--r-- | gnu/packages/graphics.scm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 931a558e8a..fdc72d5a8d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2021, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> @@ -771,11 +771,21 @@ applications, including the \"half\" 16-bit floating-point type.") (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system cmake-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "IlmBase") - #t))))) + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "IlmBase") + #t)) + #$@(if (target-x86-32?) + #~((add-after 'change-directory 'skip-test + (lambda _ + ;; XXX: This test fails on i686, + ;; possibly due to excess precision when + ;; comparing floats. Skip it. + (substitute* "ImathTest/testFun.cpp" + (("assert \\(bit_cast<unsigned>.*" all) + (string-append "// " all "\n")))))) + #~())))) (home-page "https://www.openexr.com/") (synopsis "Utility C++ libraries for threads, maths, and exceptions") (description |