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.1.3.

Browse Source 
* gnu/packages/maths.scm (cadical): Update to 2.1.3.
* gnu/packages/patches/cadical-add-shared-library.patch: Adjust accordingly.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Sören Tempel
2026-03-26 20:02:19 +01:00
committed by Liliana Marie Prikler
parent 5119d7b1d6
commit b2b885be52
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/maths.scm
View File

@@ -9895,7 +9895,7 @@ also included.")
(define-public cadical (define-public cadical
(package (package
(name "cadical") (name "cadical")
(version "2.0.0") (version "2.1.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@@ -9904,7 +9904,7 @@ also included.")
(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 (sha256
(base32 "1dzjah3z34v89ka48hncwqkxrwl4xqn9947p0ipf39lxshrq91xa")))) (base32 "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:test-target "test" (list #:test-target "test"

15
gnu/packages/patches/cadical-add-shared-library.patch
View File

@@ -12,10 +12,10 @@ Liliana Marie Prikler <liliana.prikler@gmail.com>:
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/makefile.in b/makefile.in diff --git a/makefile.in b/makefile.in
index 291cb3e3..d179f591 100644 index 5e1c1b3a..de3fe975 100644
--- a/makefile.in --- a/makefile.in
+++ b/makefile.in +++ b/makefile.in
@@ -34,7 +34,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I$(ROOT)/src @@ -38,7 +38,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I../src
#--------------------------------------------------------------------------# #--------------------------------------------------------------------------#
@@ -24,26 +24,23 @@ index 291cb3e3..d179f591 100644
#--------------------------------------------------------------------------# #--------------------------------------------------------------------------#
@@ -54,10 +54,10 @@ contrib/%.o: $(ROOT)/contrib/%.cpp $(ROOT)/contrib/%.hpp $(ROOT)/src/*.hpp makef @@ -53,14 +53,17 @@ all: libcadical.a cadical mobical
# tester 'mobical') and the library are the main build targets. # tester 'mobical') and the library are the main build targets.
cadical: src/cadical.o libcadical.a makefile cadical: cadical.o libcadical.a makefile
- $(COMPILE) -o $@ $< -L. -lcadical $(LIBS) - $(COMPILE) -o $@ $< -L. -lcadical $(LIBS)
+ $(COMPILE) -static -o $@ $< -L. -lcadical $(LIBS) + $(COMPILE) -static -o $@ $< -L. -lcadical $(LIBS)
mobical: src/mobical.o libcadical.a makefile $(LIBS) mobical: mobical.o libcadical.a makefile $(LIBS)
- $(COMPILE) -o $@ $< -L. -lcadical - $(COMPILE) -o $@ $< -L. -lcadical
+ $(COMPILE) -static -o $@ $< -L. -lcadical + $(COMPILE) -static -o $@ $< -L. -lcadical
libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
@@ -62,5 +62,8 @@ mobical: src/mobical.o libcadical.a makefile $(LIBS)
libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
+libcadical.so: $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) makefile +libcadical.so: $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) makefile
+ $(COMPILE) -shared -o $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) + $(COMPILE) -shared -o $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS)
+ +
#--------------------------------------------------------------------------# #--------------------------------------------------------------------------#
# Note that 'build.hpp' is generated and resides in the build directory. # Note that 'build.hpp' is generated and resides in the build directory.