diff -ur NuSMV-2.4.3/MiniSat/MiniSat_v070721_nusmv.patch NuSMV-2.4.3.solvers/MiniSat/MiniSat_v070721_nusmv.patch --- NuSMV-2.4.3/MiniSat/MiniSat_v070721_nusmv.patch 2007-03-27 18:13:30.000000000 +0200 +++ NuSMV-2.4.3.solvers/MiniSat/MiniSat_v070721_nusmv.patch 2009-04-22 13:02:51.000000000 +0200 @@ -434,7 +434,20 @@ CFLAGS ?= -Wall LFLAGS ?= -Wall -@@ -70,7 +71,7 @@ +@@ -60,18 +60,18 @@ + ## Build rule + %.o %.op %.od %.or: %.C + @echo Compiling: "$@ ( $< )" +- @$(CXX) $(CFLAGS) -c -o $@ $< ++ $(CXX) $(CFLAGS) -c -o $@ $< + + ## Linking rules (standard/profile/debug/release) + $(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static: + @echo Linking: "$@ ( $^ )" +- @$(CXX) $^ $(LFLAGS) -o $@ ++ $(CXX) $^ $(LFLAGS) -o $@ + + ## Library rule lib$(LIB).a lib$(LIB)d.a: @echo Library: "$@ ( $^ )" @rm -f $@ @@ -443,11 +456,32 @@ ## Clean rule clean: +@@ -81,7 +81,7 @@ + ## Make dependencies + depend.mk: $(CSRCS) $(CHDRS) + @echo Making dependencies ... +- @$(CXX) $(CFLAGS) -MM $(CSRCS) > depend.mk ++ $(CXX) $(CFLAGS) -MM $(CSRCS) > depend.mk + @cp depend.mk /tmp/depend.mk.tmp + @sed "s/o:/op:/" /tmp/depend.mk.tmp >> depend.mk + @sed "s/o:/od:/" /tmp/depend.mk.tmp >> depend.mk +diff -ur minisat_ORIG/core/Makefile minisat/core/Makefile +--- minisat_ORIG/core/Makefile 2006-10-02 14:09:37.000000000 +0200 ++++ minisat/core/Makefile 2009-04-22 13:01:08.000000000 +0200 +@@ -1,7 +1,7 @@ + MTL = ../mtl + CHDRS = $(wildcard *.h) $(wildcard $(MTL)/*.h) + EXEC = minisat +-CFLAGS = -I$(MTL) -Wall -ffloat-store ++CFLAGS = -I$(MTL) -Wall -ffloat-store $(OPTFLAGS) + LFLAGS = -lz + + include ../mtl/template.mk diff -Naur minisat.ORIG/simp/Makefile minisat/simp/Makefile --- minisat.ORIG/simp/Makefile 2006-10-02 14:09:42.000000000 +0200 +++ minisat/simp/Makefile 2010-01-27 12:44:25.000000000 +0100 @@ -5,7 +5,8 @@ - CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store + CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(OPTFLAGS) LFLAGS = -lz -CSRCS = $(wildcard *.C) 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 --- NuSMV-2.4.3/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2007-03-16 15:33:00.000000000 +0100 +++ NuSMV-2.4.3.solvers/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2009-04-22 12:59:23.000000000 +0200 @@ -1,11 +1,11 @@ -diff -Naur zchaff64_ORIG/Makefile zchaff64/Makefile ---- zchaff64_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200 -+++ zchaff64/Makefile 2009-05-06 13:19:21.000000000 +0200 +diff -Naur zchaff_ORIG/Makefile zchaff/Makefile +--- zchaff_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200 ++++ zchaff/Makefile 2009-05-06 13:19:21.000000000 +0200 @@ -1,5 +1,6 @@ CC = g++ -Wall -CFLAGS = -O3 -+CXX = g++ -Wall -+CFLAGS = -O3 ++CXX = g++ ++CFLAGS = $(OPTFLAGS) #CFLAGS = -O3 -DNDEBUG #MFLAGS = @@ -47,9 +47,9 @@ clean: rm -f *.o libsat.a zchaff *wrapper.cpp zminimal zverify_df cnf_stats SAT_C.h -diff -Naur zchaff64_ORIG/zchaff_dbase.cpp zchaff64/zchaff_dbase.cpp ---- zchaff64_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200 -+++ zchaff64/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200 +diff -Naur zchaff_ORIG/zchaff_dbase.cpp zchaff/zchaff_dbase.cpp +--- zchaff_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200 ++++ zchaff/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200 @@ -33,6 +33,7 @@ // of the possibility of those damages. // ********************************************************************/ @@ -47,9 +47,9 @@ #include #include #include -diff -Naur zchaff64_ORIG/zchaff_utils.cpp zchaff64/zchaff_utils.cpp ---- zchaff64_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200 -+++ zchaff64/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200 +diff -Naur zchaff_ORIG/zchaff_utils.cpp zchaff/zchaff_utils.cpp +--- zchaff_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200 ++++ zchaff/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200 @@ -38,7 +38,9 @@ #include #include diff -ur NuSMV-2.4.3/zchaff/zchaff-default.in NuSMV-2.4.3.solvers/zchaff/zchaff-default.in --- NuSMV-2.4.3/zchaff/zchaff-default.in 2007-03-16 15:33:00.000000000 +0100 +++ NuSMV-2.4.3.solvers/zchaff/zchaff-default.in 2009-04-22 12:58:24.000000000 +0200 @@ -9,17 +9,18 @@ # ---------------------------------------------------------------------- # this is for the older version -#zchaff_ver=2004.11.15 -#zchaff_zip=zchaff.$zchaff_ver.zip -#zchaff_dir=zchaff +zchaff_ver=2008.10.12 +zchaff_zip=zchaff.$zchaff_ver.zip +zchaff_dir=zchaff -zchaff_ver=2007.3.12 -zchaff_zip=zchaff.64bit.$zchaff_ver.zip -zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}" -zchaff_dir=zchaff64 +#zchaff_ver=2007.3.12 +#zchaff_zip=zchaff.64bit.$zchaff_ver.zip +#zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}" +#zchaff_dir=zchaff64 # ---------------------------------------------------------------------- -zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch +#zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch +zchaff_patch=zchaff.64bit.2007.3.12_nusmv.patch zchaff_link=zchaff_v${zchaff_ver} zchaff_libname=sat zchaff_ifcname=SAT_C.h