diff --git a/README.md b/README.md new file mode 100644 index 0000000..717bd6b --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# cadical +## CaDiCaL Simplified Satisfiability Solver + +The goal of the development of CaDiCaL was to obtain a CDCL solver, which is +easy to understand and change, while at the same time not being much slower +than other state-of-the-art CDCL solvers. Originally we wanted to also +radically simplify the design and internal data structures, but that goal was +only achieved partially, at least for instance compared to Lingeling. +However, the code is much better documented and CaDiCaL actually became in +general faster than Lingeling even though it is missing some preprocessors +(mostly parity and cardinality constraint reasoning), which would be crucial +to solve certain instances. diff --git a/cadical-shared.patch b/cadical-shared.patch index e705165..8cbee2a 100644 --- a/cadical-shared.patch +++ b/cadical-shared.patch @@ -1,14 +1,14 @@ ---- makefile.in.orig 2021-02-14 00:39:29.000000000 -0700 -+++ makefile.in 2021-02-14 10:24:29.599153782 -0700 +--- makefile.in.orig 2021-10-27 05:04:52.000000000 -0600 ++++ makefile.in 2021-10-28 08:09:54.761020764 -0600 @@ -9,6 +9,7 @@ CXX=@CXX@ CXXFLAGS=@CXXFLAGS@ +LDFLAGS=@LDFLAGS@ - ############################################################################ - # It is usually not necessary to change anything below this line! # -@@ -24,7 +25,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) + LIBS=@LIBS@ + +@@ -26,7 +27,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) #--------------------------------------------------------------------------# @@ -17,18 +17,18 @@ #--------------------------------------------------------------------------# -@@ -38,11 +39,17 @@ all: libcadical.a cadical mobical +@@ -40,11 +41,17 @@ all: libcadical.a cadical mobical # Application binaries (the stand alone solver 'cadical' and the model based # tester 'mobical') and the library are the main build targets. -cadical: cadical.o libcadical.a makefile -- $(COMPILE) -o $@ $< -L. -lcadical +- $(COMPILE) -o $@ $< -L. -lcadical $(LIBS) +cadical: cadical.o libcadical.so makefile -+ $(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical ++ $(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical $(LIBS) --mobical: mobical.o libcadical.a makefile +-mobical: mobical.o libcadical.a makefile $(LIBS) - $(COMPILE) -o $@ $< -L. -lcadical -+mobical: mobical.o libcadical.so makefile ++mobical: mobical.o libcadical.so makefile $(LIBS) + $(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical + +libcadical.so: $(OBJ) makefile @@ -39,8 +39,8 @@ libcadical.a: $(OBJ) makefile ar rc $@ $(OBJ) ---- test/api/run.sh.orig 2021-02-14 00:39:29.000000000 -0700 -+++ test/api/run.sh 2021-02-14 10:24:29.600153780 -0700 +--- test/api/run.sh.orig 2021-10-27 05:04:52.000000000 -0600 ++++ test/api/run.sh 2021-10-28 08:08:49.614034462 -0600 @@ -28,8 +28,8 @@ die "needs to be called from a top-level [ -f "$CADICALBUILD/makefile" ] || \ die "can not find '$CADICALBUILD/makefile' (run 'configure' first)" diff --git a/cadical.spec b/cadical.spec index a90e19d..66283d7 100644 --- a/cadical.spec +++ b/cadical.spec @@ -1,7 +1,7 @@ Name: cadical Epoch: 1 -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Summary: Simplified SAT solver License: MIT @@ -49,8 +49,8 @@ sed -i '/^-e/s/,/|/g;s/ -O3/ -O2/' configure %build # The configure script is NOT generated by autoconf. Do NOT use the # %%configure macro here. -CXXFLAGS="%{optflags} -fPIC" ./configure -sed -i "s|@LDFLAGS@|$RPM_LD_FLAGS|" build/makefile +CXXFLAGS="%{build_cxxflags} -fPIC" ./configure +sed -i "s|@LDFLAGS@|%{build_ldflags}|" build/makefile %make_build # Make man pages for the command line interface @@ -107,6 +107,9 @@ make -C test %{_libdir}/lib%{name}.so %changelog +* Thu Oct 28 2021 Jerry James - 1:1.5.2-1 +- Version 1.5.2 + * Wed Jul 21 2021 Fedora Release Engineering - 1:1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 99c3c54..735cea6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cadical-1.4.1.tar.gz) = 33aee9387273ea883a4c585b76f9d4a40e9f2e8145cc9e332012e7a7ec23b9e0b5261b6054b17685fb82f6fc495c29b4e5b73e12edb53851f40b86f2b6c35b3f +SHA512 (cadical-1.5.2.tar.gz) = 1aab87bdaec938eb219f75f13bf2fcb031f47ac1f49b586f769aeececd1c33b166341bef3bc8713e62b4612a91c405db33e6d1b48e1074a3433d80e9ecb33fe2