tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: cadical: Update to 2.2.1.

Browse Source 
* 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>
This commit is contained in:
Sören Tempel
2026-03-26 18:10:58 +01:00
committed by Liliana Marie Prikler
parent e91607864b
commit 37bb79a391
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/maths.scm
View File

@@ -9895,19 +9895,19 @@ also included.")
(define-public cadical (define-public cadical
(package (package
(name "cadical") (name "cadical")
(version "2.1.3") (version "2.2.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/arminbiere/cadical") (url "https://github.com/arminbiere/cadical")
(commit (string-append "rel-" version)))) (commit (string-append "rel-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "cadical-add-shared-library.patch"))
(sha256 (sha256
(base32 "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav")))) (base32 "09p4nm8jyvhnsgpmbawzlk8b932k33s922a2rxm77sy8s31mm13m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:test-target "test" (list #:test-target "test"
#:configure-flags #~(list "-shared")
#:modules `(((guix build copy-build-system) #:prefix copy:) #:modules `(((guix build copy-build-system) #:prefix copy:)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils) (guix build utils)
@@ -9917,16 +9917,7 @@ also included.")
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
(setenv "CXXFLAGS" "-DPIC -fPIC")
(apply invoke "./configure" configure-flags))) (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 (replace 'install
(lambda args (lambda args
(apply (apply
@@ -9957,7 +9948,25 @@ clause learning.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "cadical-add-shared-library.patch")) (patches (search-patches "cadical-add-shared-library.patch"))
(sha256 (base32 (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 (define-public cadiback
(let ((commit "789329d8fcda851085ed72f1b07d8c3f46243b8a") (let ((commit "789329d8fcda851085ed72f1b07d8c3f46243b8a")