Trac #25374: Upgrade cryptominisat to 5.8.0, fix build on Cygwin

This is to upgrade to !CryptoMiniSat 5.8.0, released 2020-07-06.

Tarball at:
https://github.com/msoos/cryptominisat/archive/refs/tags/5.8.0.tar.gz

Release notes for the versions since 5.6.8 (current in Sage):

>
> == 5.8.0 ==
>
> Massive new release! Many-many improvements:
>
> - Gauss-Jordan elimination is enabled by default
> - Target Phases ("Stable Polarities") are used
> - CCAnr SLS solver is enabled and is set to work by default
> - Hybrid variable branching heuristics
> - Many-many speed improvements
> - Better DIMACS parsing to work for other systems
> - Made to work with new ApproxMC and !UniGen
>
> == 5.7.1 ==
>
> - Removing LSIDS, as it was interfering with performance.
>
> == 5.7.0 ==
>
> - Improved parameters
> - Hybrid branching strategies
> - and much more

Previous upgrade:

- #27319: Upgrade to Cryptominisat 5.6.8 -- merged in Sage 8.9.beta2

URL: https://trac.sagemath.org/25374
Reported by: embray
Ticket author(s): Erik Bray, Thierry Monteil, François Bissey, Matthias
Koeppe
Reviewer(s): Travis Scrimshaw, Julian Rüth, Matthias Koeppe

Author: Release Manager

build/pkgs/cryptominisat/checksums.ini

@@ -1,4 +1,5 @@
 tarball=cryptominisat-VERSION.tar.gz
-sha1=db418f5ac124e8d4e1f5284f05bccbe5b61afed9
-md5=ca1bf853e568c19968daa5464ab86843
-cksum=4204324235
+sha1=f79dfa1ffc6c9c75b3a33f76d3a89a3df2b3f4c2
+md5=05bdde77aa78c983849437e93b39bd6a
+cksum=462131608
+upstream_url=https://github.com/msoos/cryptominisat/archive/refs/tags/VERSION.tar.gz

build/pkgs/cryptominisat/package-version.txt

@@ -1 +1 @@
-5.6.8
+5.8.0

build/pkgs/cryptominisat/patches/679.patch

@@ -0,0 +1,43 @@
+From a01179ffd6b0dd47bfdef2d9350d80b575571f24 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <[email protected]>
+Date: Sun, 3 Apr 2022 20:02:59 +0200
+Subject: [PATCH] python/setup.py.in: import sysconfig instead of importing it
+ from distutils
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+setuptools 61 dropped sysconfig module
+
+Ref: https://github.com/stamparm/pcapy-ng/commit/f6ce5248f78ac0a247d76e48cff152f4e3f26482
+Bug: https://bugs.gentoo.org/836684
+
+Signed-off-by: Maciej Barć <[email protected]>
+---
+ python/setup.py.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/setup.py.in b/python/setup.py.in
+index b3ab64af4..293eb1f80 100644
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -27,7 +27,7 @@ import sys
+ import os
+ import platform
+ from distutils.core import setup, Extension
+-from distutils import sysconfig
++import sysconfig
+ from distutils.cmd import Command
+ 
+ __PACKAGE_VERSION__ = "0.2.0"
+@@ -59,8 +59,8 @@ def _init_posix(init):
+     Forces g++ instead of gcc on most systems
+     credits to eric jones ([email protected]) (found at Google Groups)
+     """
+-    def wrapper():
+-        init()
++    def wrapper(vars):
++        init(vars)
+ 
+         config_vars = sysconfig.get_config_vars()  # by reference
+         if config_vars["MACHDEP"].startswith("sun"):

build/pkgs/cryptominisat/patches/cryptominisat-5.8.0-rm_extra_python_vars.patch

@@ -0,0 +1,37 @@
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index f549ca7..4a9f0d8 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -25,19 +25,6 @@ import sysconfig;
+ print(sysconfig.get_config_var('CFLAGS'), end = '')"
+     OUTPUT_VARIABLE PY_C_CONFIG)
+ 
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+-from __future__ import print_function;
+-import sysconfig;
+-print(sysconfig.get_config_var('SHLIBS'), end = '')"
+-    OUTPUT_VARIABLE PY_LD_CONFIG)
+-
+-
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+-from __future__ import print_function;
+-import sysconfig;
+-print(sysconfig.get_config_var('LINKFORSHARED'), end = '')"
+-    OUTPUT_VARIABLE PY_LINKFORSHARED_CONFIG)
+-
+ if(DEFINED ENV{PYCRYPTOSAT_INSTALL_PATH})
+     set(PY_INSTALL_PREFIX "--prefix=$ENV{PYCRYPTOSAT_INSTALL_PATH}")
+ elseif(DEFINED ENV{VIRTUAL_ENV})
+@@ -47,12 +34,8 @@ else()
+ endif()
+ 
+ string(REPLACE "\n" " " PY_C_CONFIG ${PY_C_CONFIG})
+-string(REPLACE "\n" " " PY_LD_CONFIG ${PY_LD_CONFIG})
+-string(REPLACE "\n" " " PY_LINKFORSHARED_CONFIG ${PY_LINKFORSHARED_CONFIG})
+ 
+ message(STATUS "Python CFLAGS:  '${PY_C_CONFIG}'")
+-message(STATUS "Python LDFLAGS: '${PY_LD_CONFIG}'")
+-message(STATUS "Python LINKFORSHARED flags: '${PY_LINKFORSHARED_CONFIG}'")
+ message(STATUS "Python module installation prefix: ${PY_INSTALL_PREFIX}")
+ 
+ set(PY_LD_CONFIG "${PY_LD_CONFIG} ${PY_LINKFORSHARED_CONFIG}")

build/pkgs/cryptominisat/spkg-install.in

@@ -1,5 +1,5 @@
 cd src
 
-sdh_cmake -DUSE_GAUSS='ON' $EXTRA_OPTS
+sdh_cmake -DUSE_GAUSS='ON' -DENABLE_PYTHON_INTERFACE=OFF $EXTRA_OPTS
 sdh_make VERBOSE=ON
 sdh_make_install VERBOSE=ON

build/pkgs/pycryptosat/package-version.txt

@@ -0,0 +1 @@
+../cryptominisat/package-version.txt

build/pkgs/pycryptosat/package-version.txt

@@ -0,0 +1 @@
+../cryptominisat/patches

build/pkgs/pycryptosat/patches

@@ -4,4 +4,6 @@ sdh_cmake -DUSE_GAUSS='ON' $EXTRA_OPTS
 
 cd pycryptosat
 
+export CFLAGS="$CFLAGS -std=gnu++11"
+
 sdh_pip_install .

build/pkgs/pycryptosat/spkg-install.in

@@ -88,10 +88,8 @@ def solve(F, converter=None, solver=None, n=1, target_variables=None, **kwds):
 
     This time we pass a few options through to the converter and the solver::
 
-        sage: s = solve_sat(F, s_verbosity=1, c_max_vars_sparse=4, c_cutting_number=8) # optional - pycryptosat
-        c ...
-        ...
-        sage: F.subs(s[0])                                                             # optional - pycryptosat
+        sage: s = solve_sat(F, c_max_vars_sparse=4, c_cutting_number=8) # optional - pycryptosat
+        sage: F.subs(s[0])                                              # optional - pycryptosat
         Polynomial Sequence with 36 Polynomials in 0 Variables
 
     We construct a very simple system with three solutions and ask for a specific number of solutions::