diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/cryptominisat-4.2.0.patch | 12 | ||||
| -rw-r--r-- | contrib/cryptominisat-4.2.0.second.patch | 11 | ||||
| -rwxr-xr-x | contrib/get-cryptominisat (renamed from contrib/get-cryptominisat4) | 20 |
4 files changed, 12 insertions, 35 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 937b223bf..72e354d97 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -9,11 +9,9 @@ EXTRA_DIST = \ addsourcedir \ new-theory \ configure-in-place \ - cryptominisat-4.2.0.patch \ - cryptominisat-4.2.0.second.patch \ depgraph \ get-antlr-3.4 \ - get-cryptominisat4 \ + get-cryptominisat \ get-win-dependencies \ mac-build \ run-script-smtcomp2014 \ diff --git a/contrib/cryptominisat-4.2.0.patch b/contrib/cryptominisat-4.2.0.patch deleted file mode 100644 index 30b24a3cc..000000000 --- a/contrib/cryptominisat-4.2.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/CMakeLists.txt new/CMakeLists.txt ---- CMakeLists.txt 2016-05-24 22:05:50.702570824 -0700 -+++ patched.txt 2016-05-24 22:05:57.778570529 -0700 -@@ -132,7 +132,7 @@ - set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") - SET(Boost_USE_STATIC_LIBS ON) - set(CMAKE_EXE_LINKER_FLAGS "-static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive") -- -+ add_cxx_flag_if_supported("-fPIC") - set(NOMYSQL ON) - else() - add_definitions(-DBOOST_TEST_DYN_LINK) diff --git a/contrib/cryptominisat-4.2.0.second.patch b/contrib/cryptominisat-4.2.0.second.patch deleted file mode 100644 index 4b3fdf722..000000000 --- a/contrib/cryptominisat-4.2.0.second.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python/CMakeLists.txt 2016-05-24 22:05:50.698570824 -0700 -+++ ../new/python/CMakeLists.txt 2016-05-24 22:05:57.774570529 -0700 -@@ -12,7 +12,7 @@ - - add_custom_target(pytarget ALL DEPENDS ${OUTPUT}/timestamp) - --install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --record files.txt)") -+#install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --record files.txt)") - - if (ENABLE_TESTING) - #add_test (pytest ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/test_pycryptosat.py") diff --git a/contrib/get-cryptominisat4 b/contrib/get-cryptominisat index 0a7173cce..a7a15520c 100755 --- a/contrib/get-cryptominisat4 +++ b/contrib/get-cryptominisat @@ -2,15 +2,15 @@ # source "$(dirname "$0")/get-script-header.sh" -if [ -e cryptominisat4 ]; then - echo 'error: file or directory "cryptominisat4" exists; please move it out of the way.' >&2 +if [ -e cryptominisat5 ]; then + echo 'error: file or directory "cryptominisat5" exists; please move it out of the way.' >&2 exit 1 fi -version="4.2.0" +version="5.0.2" -mkdir cryptominisat4 -cd cryptominisat4 +mkdir cryptominisat5 +cd cryptominisat5 CRYPTOMINISAT_PATH=`pwd` webget https://github.com/msoos/cryptominisat/archive/$version.tar.gz cryptominisat-$version.tar.gz @@ -18,13 +18,15 @@ gunzip -f cryptominisat-$version.tar.gz tar xfv cryptominisat-$version.tar cd cryptominisat-$version -patch -p0 < ../../contrib/cryptominisat-4.2.0.patch -patch -p0 < ../../contrib/cryptominisat-4.2.0.second.patch - mkdir ../build cd ../build -cmake -DCMAKE_INSTALL_PREFIX:PATH=$CRYPTOMINISAT_PATH/install -DSTATICCOMPILE="ON" -DNOM4RI="ON" ../cryptominisat-$version +cmake -DENABLE_PYTHON_INTERFACE=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=$CRYPTOMINISAT_PATH/install \ + -DSTATICCOMPILE=ON \ + -DNOM4RI=ON \ + ../cryptominisat-$version + make install -j$(nproc) cd ../ |