]>
Commit | Line | Data |
---|---|---|
65c2d833 JR |
1 | diff -ur NuSMV-2.4.3/MiniSat/MiniSat_v070721_nusmv.patch NuSMV-2.4.3.solvers/MiniSat/MiniSat_v070721_nusmv.patch |
2 | --- NuSMV-2.4.3/MiniSat/MiniSat_v070721_nusmv.patch 2007-03-27 18:13:30.000000000 +0200 | |
3 | +++ NuSMV-2.4.3.solvers/MiniSat/MiniSat_v070721_nusmv.patch 2009-04-22 13:02:51.000000000 +0200 | |
4 | @@ -447,11 +447,23 @@ | |
34278b65 JR |
5 | |
6 | ## Clean rule | |
7 | clean: | |
8 | +diff -ur minisat_ORIG/core/Makefile minisat/core/Makefile | |
9 | +--- minisat_ORIG/core/Makefile 2006-10-02 14:09:37.000000000 +0200 | |
10 | ++++ minisat/core/Makefile 2009-04-22 13:01:08.000000000 +0200 | |
11 | +@@ -1,7 +1,7 @@ | |
12 | + MTL = ../mtl | |
13 | + CHDRS = $(wildcard *.h) $(wildcard $(MTL)/*.h) | |
14 | + EXEC = minisat | |
15 | +-CFLAGS = -I$(MTL) -Wall -ffloat-store | |
16 | ++CFLAGS = -I$(MTL) -Wall -ffloat-store $(OPTFLAGS) | |
17 | + LFLAGS = -lz | |
18 | + | |
19 | + include ../mtl/template.mk | |
65c2d833 JR |
20 | diff -Naur minisat.ORIG/simp/Makefile minisat/simp/Makefile |
21 | --- minisat.ORIG/simp/Makefile 2006-10-02 14:09:42.000000000 +0200 | |
22 | +++ minisat/simp/Makefile 2010-01-27 12:44:25.000000000 +0100 | |
23 | @@ -5,7 +5,8 @@ | |
34278b65 | 24 | - CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store |
65c2d833 | 25 | + CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(OPTFLAGS) |
34278b65 JR |
26 | LFLAGS = -lz |
27 | ||
28 | -CSRCS = $(wildcard *.C) | |
29 | diff -ur NuSMV-2.4.3/zchaff/zchaff.64bit.2007.3.12_nusmv.patch NuSMV-2.4.3.solvers/zchaff/zchaff.64bit.2007.3.12_nusmv.patch | |
30 | --- NuSMV-2.4.3/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2007-03-16 15:33:00.000000000 +0100 | |
31 | +++ NuSMV-2.4.3.solvers/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2009-04-22 12:59:23.000000000 +0200 | |
32 | @@ -1,11 +1,11 @@ | |
33 | -diff -Naur zchaff64_ORIG/Makefile zchaff64/Makefile | |
65c2d833 JR |
34 | ---- zchaff64_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200 |
35 | -+++ zchaff64/Makefile 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 | 36 | +diff -Naur zchaff_ORIG/Makefile zchaff/Makefile |
65c2d833 JR |
37 | +--- zchaff_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200 |
38 | ++++ zchaff/Makefile 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 JR |
39 | @@ -1,5 +1,6 @@ |
40 | CC = g++ -Wall | |
41 | -CFLAGS = -O3 | |
42 | -+CXX = g++ -Wall | |
43 | -+CFLAGS = -O3 | |
44 | ++CXX = g++ | |
45 | ++CFLAGS = $(OPTFLAGS) | |
46 | ||
47 | #CFLAGS = -O3 -DNDEBUG | |
48 | #MFLAGS = | |
49 | @@ -47,9 +47,9 @@ | |
50 | ||
51 | clean: | |
52 | rm -f *.o libsat.a zchaff *wrapper.cpp zminimal zverify_df cnf_stats SAT_C.h | |
65c2d833 JR |
53 | -diff -Naur zchaff64_ORIG/zchaff_dbase.cpp zchaff64/zchaff_dbase.cpp |
54 | ---- zchaff64_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200 | |
55 | -+++ zchaff64/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200 | |
56 | +diff -Naur zchaff_ORIG/zchaff_dbase.cpp zchaff/zchaff_dbase.cpp | |
57 | +--- zchaff_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200 | |
58 | ++++ zchaff/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200 | |
59 | @@ -33,6 +33,7 @@ | |
60 | // of the possibility of those damages. | |
61 | // ********************************************************************/ | |
62 | @@ -47,9 +47,9 @@ | |
63 | #include <iostream> | |
64 | #include <vector> | |
65 | #include <set> | |
34278b65 | 66 | -diff -Naur zchaff64_ORIG/zchaff_utils.cpp zchaff64/zchaff_utils.cpp |
65c2d833 JR |
67 | ---- zchaff64_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200 |
68 | -+++ zchaff64/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 | 69 | +diff -Naur zchaff_ORIG/zchaff_utils.cpp zchaff/zchaff_utils.cpp |
65c2d833 JR |
70 | +--- zchaff_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200 |
71 | ++++ zchaff/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 JR |
72 | @@ -38,7 +38,9 @@ |
73 | #include <stdlib.h> | |
74 | #include <unistd.h> | |
75 | diff -ur NuSMV-2.4.3/zchaff/zchaff-default.in NuSMV-2.4.3.solvers/zchaff/zchaff-default.in | |
76 | --- NuSMV-2.4.3/zchaff/zchaff-default.in 2007-03-16 15:33:00.000000000 +0100 | |
77 | +++ NuSMV-2.4.3.solvers/zchaff/zchaff-default.in 2009-04-22 12:58:24.000000000 +0200 | |
65c2d833 | 78 | @@ -9,17 +9,18 @@ |
34278b65 JR |
79 | # ---------------------------------------------------------------------- |
80 | ||
81 | # this is for the older version | |
82 | -#zchaff_ver=2004.11.15 | |
83 | -#zchaff_zip=zchaff.$zchaff_ver.zip | |
84 | -#zchaff_dir=zchaff | |
85 | +zchaff_ver=2008.10.12 | |
86 | +zchaff_zip=zchaff.$zchaff_ver.zip | |
87 | +zchaff_dir=zchaff | |
88 | ||
89 | -zchaff_ver=2007.3.12 | |
90 | -zchaff_zip=zchaff.64bit.$zchaff_ver.zip | |
65c2d833 | 91 | -zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}" |
34278b65 JR |
92 | -zchaff_dir=zchaff64 |
93 | +#zchaff_ver=2007.3.12 | |
94 | +#zchaff_zip=zchaff.64bit.$zchaff_ver.zip | |
65c2d833 | 95 | +#zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}" |
34278b65 JR |
96 | +#zchaff_dir=zchaff64 |
97 | ||
98 | # ---------------------------------------------------------------------- | |
99 | -zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch | |
100 | +#zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch | |
101 | +zchaff_patch=zchaff.64bit.2007.3.12_nusmv.patch | |
65c2d833 | 102 | zchaff_link=zchaff_v${zchaff_ver} |
34278b65 JR |
103 | zchaff_libname=sat |
104 | zchaff_ifcname=SAT_C.h |