diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2026-03-26 18:10:58 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-04-04 18:27:03 +0200 |
| commit | 37bb79a391c6be63aacac11da6d6e12c08759a3a (patch) | |
| tree | cc3aa0df17ba7ac42d73c64fdec8e09d3604f317 /gnu/packages/maths.scm | |
| parent | e91607864bb831bddeb66393f5fea8d13f91381a (diff) | |
gnu: cadical: Update to 2.2.1.
* gnu/packages/maths.scm (cadical): Update to 2.2.1.
[patches]: Remove cadical-add-shared-library.patch.
[arguments]<#:configure-flags>: Add "-shared".
<#:phases>: Remove replacement for 'check.
In 'configure no longer invoke setenv before configuring.
(cadical-2.1)[#:configure-flags]: Use empty list.
[#:phases]: Add 'set-shared-flags. Replace 'check as before.
Change-Id: I67c64cfe6de0b88d0fce5103a6dcc273a2b5f244
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2b4503c172d..072bf315c61 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9895,19 +9895,19 @@ also included.") (define-public cadical (package (name "cadical") - (version "2.1.3") + (version "2.2.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/arminbiere/cadical") (commit (string-append "rel-" version)))) (file-name (git-file-name name version)) - (patches (search-patches "cadical-add-shared-library.patch")) (sha256 - (base32 "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav")))) + (base32 "09p4nm8jyvhnsgpmbawzlk8b932k33s922a2rxm77sy8s31mm13m")))) (build-system gnu-build-system) (arguments (list #:test-target "test" + #:configure-flags #~(list "-shared") #:modules `(((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) (guix build utils) @@ -9917,16 +9917,7 @@ also included.") #~(modify-phases %standard-phases (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) - (setenv "CXXFLAGS" "-DPIC -fPIC") (apply invoke "./configure" configure-flags))) - (replace 'check - (lambda args - ;; Tests are incorrectly linked upstream. - ;; Since we don't install them, just work around this in the - ;; check phase. - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/build")) - (apply (assoc-ref %standard-phases 'check) args) - (unsetenv "LD_LIBRARY_PATH"))) (replace 'install (lambda args (apply @@ -9957,7 +9948,25 @@ clause learning.") (file-name (git-file-name name version)) (patches (search-patches "cadical-add-shared-library.patch")) (sha256 (base32 - "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav")))))) + "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav")))) + (arguments (substitute-keyword-arguments (package-arguments cadical) + ((#:configure-flags _) + #~(list)) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'configure 'set-shared-flags + (lambda _ + (setenv "CXXFLAGS" "-DPIC -fPIC"))) + (replace 'check + (lambda args + ;; Tests are incorrectly linked upstream. + ;; Since we don't install them, just work around this in the + ;; check phase. + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/build")) + (apply (assoc-ref %standard-phases + 'check) args) + (unsetenv "LD_LIBRARY_PATH"))))))))) (define-public cadiback (let ((commit "789329d8fcda851085ed72f1b07d8c3f46243b8a") |