me
/
guix
Archived
1
0
Fork 0
Code

gnu: gsl: Demote conditional phase logic. 

* gnu/packages/maths.scm (gsl)[arguments]: Move 'cond' within
'modify-phases'.
master
Ludovic Courtès 2020-11-24 14:06:28 +01:00
parent cf495c934e
commit 4f6fbe7555
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gnu/packages/maths.scm
View File

@ -476,35 +476,37 @@ precision floating point numbers.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(let ((system (%current-system))) (let ((system (%current-system)))
(cond `(#:phases
((or (string-prefix? "aarch64" system) (modify-phases %standard-phases
(string-prefix? "powerpc" system)) ,@(cond
;; Some sparse matrix tests are failing on AArch64 and PowerPC: ((or (string-prefix? "aarch64" system)
;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html (string-prefix? "powerpc" system))
'(#:phases (modify-phases %standard-phases ;; Some sparse matrix tests are failing on AArch64 and PowerPC:
(add-before 'check 'disable-failing-tests ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html
(lambda _ '((add-before 'check 'disable-failing-tests
(substitute* "spmatrix/test.c" (lambda _
((".*test_complex.*") "\n")) (substitute* "spmatrix/test.c"
#t))))) ((".*test_complex.*") "\n"))
((string-prefix? "i686" system) #t))))
;; There are rounding issues with these tests on i686:
;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html ((string-prefix? "i686" system)
;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html ;; There are rounding issues with these tests on i686:
'(#:phases (modify-phases %standard-phases ;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html
(add-before 'check 'disable-failing-tests ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html
(lambda _ '((add-before 'check 'disable-failing-tests
(substitute* "linalg/test.c" (lambda _
((".*gsl_test\\(test_LU_decomp.*") "\n") (substitute* "linalg/test.c"
((".*gsl_test\\(test_LUc_decomp.*") "\n") ((".*gsl_test\\(test_LU_decomp.*") "\n")
((".*gsl_test\\(test_cholesky_decomp.*") "\n") ((".*gsl_test\\(test_LUc_decomp.*") "\n")
((".*gsl_test\\(test_COD_lssolve2.*") "\n")) ((".*gsl_test\\(test_cholesky_decomp.*") "\n")
(substitute* "spmatrix/test.c" ((".*gsl_test\\(test_COD_lssolve2.*") "\n"))
((".*test_all.*") "\n") (substitute* "spmatrix/test.c"
((".*test_float.*") "\n") ((".*test_all.*") "\n")
((".*test_complex.*") "\n")) ((".*test_float.*") "\n")
#t))))) ((".*test_complex.*") "\n"))
(else '())))) #t))))
(else '()))))))
(home-page "https://www.gnu.org/software/gsl/") (home-page "https://www.gnu.org/software/gsl/")
(synopsis "Numerical library for C and C++") (synopsis "Numerical library for C and C++")
(description (description