diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:17:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:17:05 -0400 |
| commit | 536fc5f8cd45023c3c6f28f9c768338b5e797b47 (patch) | |
| tree | 8516410664ed4d6ff0f68b48e71e5ec866367c44 /gnu/packages/maths.scm | |
| parent | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (diff) | |
| parent | a8cb87abe98d57fb763d5b14524dc32c96bd31b5 (diff) | |
| download | patches-536fc5f8cd45023c3c6f28f9c768338b5e797b47.tar patches-536fc5f8cd45023c3c6f28f9c768338b5e797b47.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e81b197061..fcea0bca0e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2192,7 +2192,14 @@ specifications.") ;; Pretend to be on a 64 bit platform to obtain a common directory ;; name for the build results on all architectures; nothing else ;; seems to depend on it. - (("^PLATFORM=.*$") "PLATFORM=ux64\n"))))) + (("^PLATFORM=.*$") "PLATFORM=ux64\n") + + ;; The check for 'isnan' as it is written fails with + ;; "non-floating-point argument in call to function + ;; ‘__builtin_isnan’", which leads to the 'NOISNAN' cpp macro + ;; definition, which in turn leads to bad things. Fix the feature + ;; test. + (("isnan\\(0\\)") "isnan(0.)"))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -2201,11 +2208,10 @@ specifications.") (delete 'configure) (replace 'build (lambda _ - (with-directory-excursion "lpsolve55" - (system* "bash" "ccc")) - (with-directory-excursion "lp_solve" - (system* "bash" "ccc")) - #t)) + (and (with-directory-excursion "lpsolve55" + (zero? (system* "bash" "ccc"))) + (with-directory-excursion "lp_solve" + (zero? (system* "bash" "ccc")))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2241,7 +2247,7 @@ revised simplex and the branch-and-bound methods.") (define-public dealii (package (name "dealii") - (version "8.2.1") + (version "8.4.1") (source (origin (method url-fetch) @@ -2249,8 +2255,7 @@ revised simplex and the branch-and-bound methods.") "download/v" version "/dealii-" version ".tar.gz")) (sha256 (base32 - "185jych0gdnpkjwxni7pd0dda149492zwq2457xdjg76bzj78mnp")) - (patches (search-patches "dealii-p4est-interface.patch")) + "1bdksvvyp1rj37df1ndh8j3x9nzpc3sazw8nd0hzvnlw0qnyk800")) (modules '((guix build utils))) (snippet ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost |