diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
| commit | 023522d3a1e81fe9bc803183337fdc8c183a88c4 (patch) | |
| tree | ec374744812891a627f33fa457b0bcf083e2c142 /gnu/packages/graphics.scm | |
| parent | 07abc851ce8a580253061e065b31a4037d2f965d (diff) | |
| parent | 7373eb8304e0ebbfabe66deb59e78187013403dd (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e453d9fa5bd..917e7ba3974 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -433,23 +433,31 @@ graphics.") #t)))) (build-system cmake-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ (chdir "OpenEXR") #t)) - (add-after 'change-directory 'disable-broken-test - ;; This test fails on i686. Upstream developers suggest that - ;; this test is broken on i686 and can be safely disabled: - ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748 + (add-before 'check 'increase-test-timeout (lambda _ - (substitute* "IlmImfTest/main.cpp" - (("#include \"testOptimizedInterleavePatterns.h\"") - "//#include \"testOptimizedInterleavePatterns.h\"") - (("TEST \\(testOptimizedInterleavePatterns") - "//TEST (testOptimizedInterleavePatterns")) - #t))))) + ;; On armhf-linux, we need to override the CTest default + ;; timeout of 1500 seconds for the OpenEXR.IlmImf test. + (setenv "CTEST_TEST_TIMEOUT" "2000") + #t)) + ,@(if (not (target-64bit?)) + `((add-after 'change-directory 'disable-broken-test + ;; This test fails on i686. Upstream developers suggest that + ;; this test is broken on i686 and can be safely disabled: + ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748 + (lambda _ + (substitute* "IlmImfTest/main.cpp" + ((".*testOptimizedInterleavePatterns.*") "") + ;; This test is broken in 2.4.0 and will be fixed in a later + ;; release: <https://github.com/openexr/openexr/issues/571>. + ((".*testLargeDataWindowOffsets.*") "")) + #t))) + '())))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs @@ -665,7 +673,6 @@ virtual reality, scientific visualization and modeling.") (list "COMPILED_BY=Guix" (string-append "--with-boost-libdir=" (assoc-ref %build-inputs "boost") "/lib") - "CXXFLAGS=-std=c++11" "--disable-optimiz-arch") #:phases (modify-phases %standard-phases |