diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2026-03-26 20:02:19 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-04-04 18:27:03 +0200 |
| commit | b2b885be5217387df82b54d298f58f00dcbe641a (patch) | |
| tree | 292b481205e562041bcf887bb24af335aaf2e79b /gnu | |
| parent | 5119d7b1d639ddf3fc677a6adf60c6ad4bc622ad (diff) | |
gnu: cadical: Update to 2.1.3.
* 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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/maths.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/cadical-add-shared-library.patch | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5a32536c91f..530be30778d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9895,7 +9895,7 @@ also included.") (define-public cadical (package (name "cadical") - (version "2.0.0") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -9904,7 +9904,7 @@ also included.") (file-name (git-file-name name version)) (patches (search-patches "cadical-add-shared-library.patch")) (sha256 - (base32 "1dzjah3z34v89ka48hncwqkxrwl4xqn9947p0ipf39lxshrq91xa")))) + (base32 "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav")))) (build-system gnu-build-system) (arguments (list #:test-target "test" diff --git a/gnu/packages/patches/cadical-add-shared-library.patch b/gnu/packages/patches/cadical-add-shared-library.patch index a1ae786d137..253505397f8 100644 --- a/gnu/packages/patches/cadical-add-shared-library.patch +++ b/gnu/packages/patches/cadical-add-shared-library.patch @@ -12,10 +12,10 @@ Liliana Marie Prikler <liliana.prikler@gmail.com>: 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makefile.in b/makefile.in -index 291cb3e3..d179f591 100644 +index 5e1c1b3a..de3fe975 100644 --- a/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. - cadical: src/cadical.o libcadical.a makefile + cadical: cadical.o libcadical.a makefile - $(COMPILE) -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) -static -o $@ $< -L. -lcadical libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile 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 + $(COMPILE) -shared -o $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) + #--------------------------------------------------------------------------# - # Note that 'build.hpp' is generated and resides in the build directory.
\ No newline at end of file + # Note that 'build.hpp' is generated and resides in the build directory. |