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
11 + %.o %.op %.od %.or: %.C
12 + @echo Compiling: "$@ ( $< )"
13 +- @$(CXX) $(CFLAGS) -c -o $@ $<
14 ++ $(CXX) $(CFLAGS) -c -o $@ $<
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 $@
23 lib$(LIB).a lib$(LIB)d.a:
24 @echo Library: "$@ ( $^ )"
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
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
44 + CHDRS = $(wildcard *.h) $(wildcard $(MTL)/*.h)
46 +-CFLAGS = -I$(MTL) -Wall -ffloat-store
47 ++CFLAGS = -I$(MTL) -Wall -ffloat-store $(OPTFLAGS)
50 + include ../mtl/template.mk
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
55 - CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store
56 + CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(OPTFLAGS)
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
64 -diff -Naur zchaff64_ORIG/Makefile zchaff64/Makefile
65 ---- zchaff64_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200
66 -+++ zchaff64/Makefile 2009-05-06 13:19:21.000000000 +0200
67 +diff -Naur zchaff_ORIG/Makefile zchaff/Makefile
68 +--- zchaff_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200
69 ++++ zchaff/Makefile 2009-05-06 13:19:21.000000000 +0200
76 ++CFLAGS = $(OPTFLAGS)
78 #CFLAGS = -O3 -DNDEBUG
83 rm -f *.o libsat.a zchaff *wrapper.cpp zminimal zverify_df cnf_stats SAT_C.h
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
91 // of the possibility of those damages.
92 // ********************************************************************/
97 -diff -Naur zchaff64_ORIG/zchaff_utils.cpp zchaff64/zchaff_utils.cpp
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
100 +diff -Naur zchaff_ORIG/zchaff_utils.cpp zchaff/zchaff_utils.cpp
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
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
110 # ----------------------------------------------------------------------
112 # this is for the older version
113 -#zchaff_ver=2004.11.15
114 -#zchaff_zip=zchaff.$zchaff_ver.zip
116 +zchaff_ver=2008.10.12
117 +zchaff_zip=zchaff.$zchaff_ver.zip
120 -zchaff_ver=2007.3.12
121 -zchaff_zip=zchaff.64bit.$zchaff_ver.zip
122 -zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}"
124 +#zchaff_ver=2007.3.12
125 +#zchaff_zip=zchaff.64bit.$zchaff_ver.zip
126 +#zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}"
127 +#zchaff_dir=zchaff64
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
133 zchaff_link=zchaff_v${zchaff_ver}
135 zchaff_ifcname=SAT_C.h