diff --git a/build/pkgs/cryptominisat/SPKG.txt b/build/pkgs/cryptominisat/SPKG.txt index e34296fdf7a..c1ee354a588 100644 --- a/build/pkgs/cryptominisat/SPKG.txt +++ b/build/pkgs/cryptominisat/SPKG.txt @@ -15,16 +15,17 @@ == License == - * GNU General Public License Version 3 or later (see src/COPYING) +MIT License == Upstream Contact == - * Authors: Mate Soos - * Email: soos.mate@gmail.com - * Website: http://www.msoos.org/cryptominisat2 + * Authors: Mate Soos + * Email: soos.mate@gmail.com + * Website: http://www.msoos.org/ + * Releases: https://github.com/msoos/cryptominisat/releases == Special Update/Build Instructions == -CryptoMiniSat's tarball is called cmsat-VERSION.tar.gz and unpacks to -cmsat-VERSION. It should be unpacked, renamed to cryptominisat-VERSION and -repackaged. +CryptoMiniSat's tarball downloaded from github is called VERSION.tar.gz +and should be renamed to cryptominisat-VERSION.tar.gz + diff --git a/build/pkgs/cryptominisat/checksums.ini b/build/pkgs/cryptominisat/checksums.ini index 27efce91789..5e6fd58fe7b 100644 --- a/build/pkgs/cryptominisat/checksums.ini +++ b/build/pkgs/cryptominisat/checksums.ini @@ -1,4 +1,4 @@ tarball=cryptominisat-VERSION.tar.gz -sha1=3566754f4e1eb5aefec703f7806c74e4c3edda80 -md5=6fdabd54dc9076e0e2f28f489f5eab64 -cksum=2155609827 +sha1=f270bc232dbf273d5059f4c0cb704df7cf1f507d +md5=45203be947368de75b44cf734cbac1d7 +cksum=1496245059 diff --git a/build/pkgs/cryptominisat/dependencies b/build/pkgs/cryptominisat/dependencies index 3546cda4614..df51e312747 100644 --- a/build/pkgs/cryptominisat/dependencies +++ b/build/pkgs/cryptominisat/dependencies @@ -1,4 +1,4 @@ -# no dependencies +$(PYTHON) | cmake sqlite m4ri boost_cropped ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cryptominisat/package-version.txt b/build/pkgs/cryptominisat/package-version.txt index 23ae1b5dc26..6b244dcd696 100644 --- a/build/pkgs/cryptominisat/package-version.txt +++ b/build/pkgs/cryptominisat/package-version.txt @@ -1 +1 @@ -2.9.6 +5.0.1 diff --git a/build/pkgs/cryptominisat/spkg-install b/build/pkgs/cryptominisat/spkg-install index 35a1d0dda59..6cdf3a80a0b 100755 --- a/build/pkgs/cryptominisat/spkg-install +++ b/build/pkgs/cryptominisat/spkg-install @@ -1,76 +1,21 @@ #!/usr/bin/env bash -if [ "$SAGE_LOCAL" = "" ]; then - echo "SAGE_LOCAL undefined ... exiting" - echo "Maybe run 'sage -sh'?" - exit 1 -fi - -unset RM - -INCLUDES="-I$SAGE_LOCAL/include" -LIBDIRS="-L$SAGE_LOCAL/lib" - -CXXFLAGS="$CXXFLAGS $INCLUDES $LIBDIRS -g" - -COMPILER=`testcc.sh $CC` - -if [ "x$COMPILER" = "xGNU" ] ; then - CXXFLAGS="$CXXFLAGS -fPIC -Wall -pedantic" -elif [ "x$COMPILER" = "xSun_on_Solaris" ] ; then - CXXFLAGS="$CXXFLAGS -Kpic" -elif [ "x$COMPILER" = "xHP_on_HPUX" ] ; then - CXXFLAGS="$CXXFLAGS + z" -fi - -CPPFLAGS="$INCLUDES" - -if [ "x$SAGE_DEBUG" = "xyes" ]; then - CXXFLAGS="$CXXFLAGS -O0" - ENABLE_DEBUG="--enable-debug" -else - CXXFLAGS="$CXXFLAGS -O2" - ENABLE_DEBUG="" -fi +fail () { + echo -e >&2 $1 + exit 1 +} -if [ "x$SAGE64" = "xyes" ]; then - CXXFLAGS="$CXXFLAGS -m64" - CPPFLAGS="$CPPFLAGS -m64" - # FIXME: Do we need LDFLAGS here, too? - # But looks as if all linking is performed by libtool/ - # gcc, so we do not really need it here. +if [ "$SAGE_LOCAL" = "" ]; then + fail "SAGE_LOCAL undefined ... exiting\nMaybe run 'sage -sh'?" fi -export CXXFLAGS -export CPPFLAGS - - -#build CryptoMiniSat - cd src -$MAKE clean - -./configure --prefix=$SAGE_LOCAL $ENABLE_DEBUG - -if [ $? -ne 0 ]; then - echo "Error configuring cryptominisat" - exit 1 -fi +cmake -DCMAKE_INSTALL_PREFIX="${SAGE_LOCAL}" -DUSE_GAUSS='ON' . || fail 'Error configuring cryptominisat' -$MAKE +$MAKE || fail 'Error building cryptominisat' -if [ $? -ne 0 ]; then - echo "Error building cryptominisat" - exit 1 -fi - -$MAKE install - -if [ $? -ne 0 ]; then - echo "Error installing cryptominisat" - exit 1 -fi +$MAKE install || fail 'Error installing cryptominisat' -cd .. +exit 0