[arch-commits] Commit in cryptominisat5/trunk (PKGBUILD)

[Kyle Keen]

    Date: Thursday, March 14, 2019 @ 17:01:24
  Author: kkeen
Revision: 441036

upgpkg: cryptominisat5 5.6.8-2  add python3 module

Modified:
  cryptominisat5/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-14 17:01:05 UTC (rev 441035)
+++ PKGBUILD	2019-03-14 17:01:24 UTC (rev 441036)
@@ -5,7 +5,7 @@
 
 pkgname=cryptominisat5
 pkgver=5.6.8
-pkgrel=1
+pkgrel=2
 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,17 +12,16 @@
 url="https://github.com/msoos/cryptominisat/"
 license=('MIT')
 depends=('zlib' 'gcc-libs' 'boost-libs' 'intel-tbb')
-makedepends=('python2' 'boost' 'cmake' 'vim')
+makedepends=('python2' 'python' 'boost' 'cmake' 'vim')
 # vim for xxd
-optdepends=('python2: python module')
+optdepends=('python2: python2 module'
+            'python: python module')
 source=("cms5-$pkgver.tgz::https://github.com/msoos/cryptominisat/archive/$pkgver.tar.gz")
 md5sums=('ca1bf853e568c19968daa5464ab86843')
 
 # many fancy features requiring makedeps
-# intel-tbb, python2, m4ri, libmysqlclient, valgrind
+# intel-tbb, python2, python3, m4ri, libmysqlclient, valgrind
 
-# todo, upstream python3 support
-
 prepare() {
   cd cryptominisat-$pkgver
   sed -i 's/python$/python2/' python/Makefile
@@ -39,19 +38,29 @@
   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
       -DNOM4RI=on -DNOMYSQL=on ../
   make
+
+  # no way to build both the py2 and py3 modules
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+      -DNOM4RI=on -DNOMYSQL=on -DFORCE_PYTHON2=on ../
+  make
+
   cd pycryptosat
   python2 setup.py build
+  python3 setup.py build
 }
 
 check() {
-  _TESTPATH="$PYTHONPATH:$srcdir/cryptominisat-$pkgver/build/pycryptosat"
   cd "$srcdir/cryptominisat-$pkgver/build/pycryptosat"
+  _TESTPATH="$PYTHONPATH:$PWD"
+
+  # smoke test
   ln -sf pycryptosat.so libcryptominisat5.so.5.6
   PYTHONPATH=$_TESTPATH python2 -c "from pycryptosat import Solver"
-  return
-  cd "$srcdir/cryptominisat-$pkgver/python/tests"
-  ln -sf "$srcdir/cryptominisat-$pkgver/build/pycryptosat/pycryptosat.so" libcryptominisat5.so.5.6
-  PYTHONPATH=$_TESTPATH python2 test_pycryptosat.py
+  PYTHONPATH=$_TESTPATH python3 -c "from pycryptosat import Solver"
+
+  # skip all the cmake stuff
+  PYTHONPATH=$_TESTPATH python2 tests/test_pycryptosat.py
+  PYTHONPATH=$_TESTPATH python3 tests/test_pycryptosat.py
 }
 
 package() {
@@ -62,5 +71,6 @@
   # todo, tweak the build tools to respect DESTDIR
   cd pycryptosat
   python2 setup.py install --record files.txt --root="${pkgdir}"
+  python3 setup.py install --record files.txt --root="${pkgdir}"
 }