Commit in cryptominisat5/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Sunday, October 2, 2022 @ 16:44:30
  Author: arojas
Revision: 1320676

upgpkg: cryptominisat5 5.11.2-1: Update to 5.11.2

Modified:
  cryptominisat5/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-02 16:36:54 UTC (rev 1320675)
+++ PKGBUILD    2022-10-02 16:44:30 UTC (rev 1320676)
@@ -4,8 +4,8 @@
 # need to hack up the pythonpath and get the tests to run
 
 pkgname=cryptominisat5
-pkgver=5.8.0
-pkgrel=11
+pkgver=5.11.2
+pkgrel=1
 pkgdesc="A modern, multi-threaded, feature-rich, simplifying SAT solver"
 arch=('x86_64')
 #url="https://www.msoos.org/2016/07/cryptominisat-5-0-0-released/";
@@ -12,11 +12,11 @@
 url="https://github.com/msoos/cryptominisat/";
 license=('MIT')
 depends=('zlib' 'gcc-libs' 'boost-libs' 'sqlite' 'm4ri')
-makedepends=('python' 'boost' 'cmake' 'vim' 'help2man')
+makedepends=('python' 'boost' 'cmake' 'vim' 'help2man' 'python-setuptools')
 # vim for xxd
 optdepends=('python: python module')
 
source=("cms5-$pkgver.tgz::https://github.com/msoos/cryptominisat/archive/$pkgver.tar.gz";)
-md5sums=('05bdde77aa78c983849437e93b39bd6a')
+md5sums=('39f431243ac8a9db1b3f0fd9045a1dcc')
 
 # many fancy features requiring makedeps
 # python3, m4ri, valgrind
@@ -38,20 +38,14 @@
   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
   make
 
-  cd pycryptosat
+  cd ..
   python3 setup.py build
 }
 
 check() {
-  cd "$srcdir/cryptominisat-$pkgver/build/pycryptosat"
-  _TESTPATH="$PYTHONPATH:$PWD"
-
-  # smoke test
-  ln -sf pycryptosat.so libcryptominisat5.so.5.6
-  PYTHONPATH=$_TESTPATH python3 -c "from pycryptosat import Solver"
-
-  # skip all the cmake stuff
-  PYTHONPATH=$_TESTPATH python3 tests/test_pycryptosat.py
+  cd cryptominisat-$pkgver
+  _pythonpath=`echo build/lib.*`
+  PYTHONPATH="$PWD/$_pythonpath" python3 python/tests/test_pycryptosat.py
 }
 
 package() {
@@ -60,6 +54,8 @@
   cd build
   make install DESTDIR="$pkgdir"
   # todo, tweak the build tools to respect DESTDIR
-  cd pycryptosat
+  cd ..
   python3 setup.py install --record files.txt --root="${pkgdir}"
+  # Remove stray source files
+  rm -r "$pkgdir"/usr/lib/python*/site-packages/{msvc,oracle,picosat}
 }