]>
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 | |
ffbb5256 JR |
4 | @@ -434,7 +434,20 @@ |
5 | CFLAGS ?= -Wall | |
6 | LFLAGS ?= -Wall | |
7 | ||
8 | -@@ -70,7 +71,7 @@ | |
9 | +@@ -60,18 +60,18 @@ | |
10 | + ## Build rule | |
11 | + %.o %.op %.od %.or: %.C | |
12 | + @echo Compiling: "$@ ( $< )" | |
13 | +- @$(CXX) $(CFLAGS) -c -o $@ $< | |
14 | ++ $(CXX) $(CFLAGS) -c -o $@ $< | |
15 | + | |
16 | + ## Linking rules (standard/profile/debug/release) | |
17 | + $(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static: | |
18 | + @echo Linking: "$@ ( $^ )" | |
19 | +- @$(CXX) $^ $(LFLAGS) -o $@ | |
20 | ++ $(CXX) $^ $(LFLAGS) -o $@ | |
21 | + | |
22 | + ## Library rule | |
23 | lib$(LIB).a lib$(LIB)d.a: | |
24 | @echo Library: "$@ ( $^ )" | |
25 | @rm -f $@ | |
26 | @@ -443,11 +456,32 @@ | |
34278b65 JR |
27 | |
28 | ## Clean rule | |
29 | clean: | |
ffbb5256 JR |
30 | +@@ -81,7 +81,7 @@ |
31 | + ## Make dependencies | |
32 | + depend.mk: $(CSRCS) $(CHDRS) | |
33 | + @echo Making dependencies ... | |
34 | +- @$(CXX) $(CFLAGS) -MM $(CSRCS) > depend.mk | |
35 | ++ $(CXX) $(CFLAGS) -MM $(CSRCS) > depend.mk | |
36 | + @cp depend.mk /tmp/depend.mk.tmp | |
37 | + @sed "s/o:/op:/" /tmp/depend.mk.tmp >> depend.mk | |
38 | + @sed "s/o:/od:/" /tmp/depend.mk.tmp >> depend.mk | |
34278b65 JR |
39 | +diff -ur minisat_ORIG/core/Makefile minisat/core/Makefile |
40 | +--- minisat_ORIG/core/Makefile 2006-10-02 14:09:37.000000000 +0200 | |
41 | ++++ minisat/core/Makefile 2009-04-22 13:01:08.000000000 +0200 | |
42 | +@@ -1,7 +1,7 @@ | |
43 | + MTL = ../mtl | |
44 | + CHDRS = $(wildcard *.h) $(wildcard $(MTL)/*.h) | |
45 | + EXEC = minisat | |
46 | +-CFLAGS = -I$(MTL) -Wall -ffloat-store | |
47 | ++CFLAGS = -I$(MTL) -Wall -ffloat-store $(OPTFLAGS) | |
48 | + LFLAGS = -lz | |
49 | + | |
50 | + include ../mtl/template.mk | |
65c2d833 JR |
51 | diff -Naur minisat.ORIG/simp/Makefile minisat/simp/Makefile |
52 | --- minisat.ORIG/simp/Makefile 2006-10-02 14:09:42.000000000 +0200 | |
53 | +++ minisat/simp/Makefile 2010-01-27 12:44:25.000000000 +0100 | |
54 | @@ -5,7 +5,8 @@ | |
34278b65 | 55 | - CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store |
65c2d833 | 56 | + CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(OPTFLAGS) |
34278b65 JR |
57 | LFLAGS = -lz |
58 | ||
59 | -CSRCS = $(wildcard *.C) | |
60 | 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 | |
61 | --- NuSMV-2.4.3/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2007-03-16 15:33:00.000000000 +0100 | |
62 | +++ NuSMV-2.4.3.solvers/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2009-04-22 12:59:23.000000000 +0200 | |
63 | @@ -1,11 +1,11 @@ | |
64 | -diff -Naur zchaff64_ORIG/Makefile zchaff64/Makefile | |
65c2d833 JR |
65 | ---- zchaff64_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200 |
66 | -+++ zchaff64/Makefile 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 | 67 | +diff -Naur zchaff_ORIG/Makefile zchaff/Makefile |
65c2d833 JR |
68 | +--- zchaff_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200 |
69 | ++++ zchaff/Makefile 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 JR |
70 | @@ -1,5 +1,6 @@ |
71 | CC = g++ -Wall | |
72 | -CFLAGS = -O3 | |
73 | -+CXX = g++ -Wall | |
74 | -+CFLAGS = -O3 | |
75 | ++CXX = g++ | |
76 | ++CFLAGS = $(OPTFLAGS) | |
77 | ||
78 | #CFLAGS = -O3 -DNDEBUG | |
79 | #MFLAGS = | |
80 | @@ -47,9 +47,9 @@ | |
81 | ||
82 | clean: | |
83 | rm -f *.o libsat.a zchaff *wrapper.cpp zminimal zverify_df cnf_stats SAT_C.h | |
65c2d833 JR |
84 | -diff -Naur zchaff64_ORIG/zchaff_dbase.cpp zchaff64/zchaff_dbase.cpp |
85 | ---- zchaff64_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200 | |
86 | -+++ zchaff64/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200 | |
87 | +diff -Naur zchaff_ORIG/zchaff_dbase.cpp zchaff/zchaff_dbase.cpp | |
88 | +--- zchaff_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200 | |
89 | ++++ zchaff/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200 | |
90 | @@ -33,6 +33,7 @@ | |
91 | // of the possibility of those damages. | |
92 | // ********************************************************************/ | |
93 | @@ -47,9 +47,9 @@ | |
94 | #include <iostream> | |
95 | #include <vector> | |
96 | #include <set> | |
34278b65 | 97 | -diff -Naur zchaff64_ORIG/zchaff_utils.cpp zchaff64/zchaff_utils.cpp |
65c2d833 JR |
98 | ---- zchaff64_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200 |
99 | -+++ zchaff64/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 | 100 | +diff -Naur zchaff_ORIG/zchaff_utils.cpp zchaff/zchaff_utils.cpp |
65c2d833 JR |
101 | +--- zchaff_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200 |
102 | ++++ zchaff/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200 | |
34278b65 JR |
103 | @@ -38,7 +38,9 @@ |
104 | #include <stdlib.h> | |
105 | #include <unistd.h> | |
106 | diff -ur NuSMV-2.4.3/zchaff/zchaff-default.in NuSMV-2.4.3.solvers/zchaff/zchaff-default.in | |
107 | --- NuSMV-2.4.3/zchaff/zchaff-default.in 2007-03-16 15:33:00.000000000 +0100 | |
108 | +++ NuSMV-2.4.3.solvers/zchaff/zchaff-default.in 2009-04-22 12:58:24.000000000 +0200 | |
65c2d833 | 109 | @@ -9,17 +9,18 @@ |
34278b65 JR |
110 | # ---------------------------------------------------------------------- |
111 | ||
112 | # this is for the older version | |
113 | -#zchaff_ver=2004.11.15 | |
114 | -#zchaff_zip=zchaff.$zchaff_ver.zip | |
115 | -#zchaff_dir=zchaff | |
116 | +zchaff_ver=2008.10.12 | |
117 | +zchaff_zip=zchaff.$zchaff_ver.zip | |
118 | +zchaff_dir=zchaff | |
119 | ||
120 | -zchaff_ver=2007.3.12 | |
121 | -zchaff_zip=zchaff.64bit.$zchaff_ver.zip | |
65c2d833 | 122 | -zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}" |
34278b65 JR |
123 | -zchaff_dir=zchaff64 |
124 | +#zchaff_ver=2007.3.12 | |
125 | +#zchaff_zip=zchaff.64bit.$zchaff_ver.zip | |
65c2d833 | 126 | +#zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}" |
34278b65 JR |
127 | +#zchaff_dir=zchaff64 |
128 | ||
129 | # ---------------------------------------------------------------------- | |
130 | -zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch | |
131 | +#zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch | |
132 | +zchaff_patch=zchaff.64bit.2007.3.12_nusmv.patch | |
65c2d833 | 133 | zchaff_link=zchaff_v${zchaff_ver} |
34278b65 JR |
134 | zchaff_libname=sat |
135 | zchaff_ifcname=SAT_C.h |