Disable zlib and OpenMP support in CryptoMiniSat.

Until the build system is updated to produce a dynamic library, it's
easier to avoid dependencies on any other libraries.

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index d5b47af4bb9d4f2325636b21e0947872cb839984..f5b0930d35f58e7e1000353e146d2ff0f71dbdc4 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -47,7 +47,7 @@ ifdef STATIC
 endif
 
 
-LDFLAGS = $(LDFLAGS_BASE) -lz -fopenmp
+LDFLAGS = $(LDFLAGS_BASE)
 CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32)
 
 

diff --git a/src/sat/cryptominisat2/Makefile b/src/sat/cryptominisat2/Makefile
index c00c033aa530907b528f28436423254bd7df45ed..30a3a6631a38b6df50aab84b4ca98472cc31c19b 100644 (file)
--- a/src/sat/cryptominisat2/Makefile
+++ b/src/sat/cryptominisat2/Makefile
@@ -18,7 +18,7 @@ SOURCES   = Logger.cpp Solver.cpp PackedRow.cpp \
             SCCFinder.cpp
 OBJECTS   = $(SOURCES:.cpp=.o)
 LIB       = libminisat.a
-CFLAGS    += -I../.. -I$(MTL) -I$(MTRAND) -fopenmp -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32) -c
+CFLAGS    += -I../.. -I$(MTL) -I$(MTRAND) -DDISABLE_ZLIB -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32) -c
 EXEC      = minisat
 LFLAGS    = -lz
 

diff --git a/src/sat/cryptominisat2/SolverMisc.cpp b/src/sat/cryptominisat2/SolverMisc.cpp
index e457704029127b68982f49a12ad2b8e09ae9f763..a42b37e4a18aac27a02c97a9d0a5aa6f1955a525 100644 (file)
--- a/src/sat/cryptominisat2/SolverMisc.cpp
+++ b/src/sat/cryptominisat2/SolverMisc.cpp
@@ -625,7 +625,12 @@ void Solver::printStats()
     double   cpu_time = cpuTime();
     uint64_t mem_used = memUsed();
 
-    int numThreads = omp_get_num_threads();
+#ifdef _OPENMP
+    const int numThreads = omp_get_num_threads();
+#else
+    const int numThreads = 1;
+#endif
+
     if (numThreads > 1) {
         std::cout << "c Following stats are for *FIRST FINISHED THREAD ONLY*" << std::endl;
         #if !defined(_MSC_VER) && !defined(RUSAGE_THREAD)