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

[Antonio Rojas]

    Date: Thursday, January 2, 2020 @ 08:32:57
  Author: arojas
Revision: 546019

Drop python2

Modified:
  cryptominisat5/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-02 08:27:59 UTC (rev 546018)
+++ PKGBUILD	2020-01-02 08:32:57 UTC (rev 546019)
@@ -5,7 +5,7 @@
 
 pkgname=cryptominisat5
 pkgver=5.6.8
-pkgrel=4
+pkgrel=5
 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,19 +12,17 @@
 url="https://github.com/msoos/cryptominisat/"
 license=('MIT')
 depends=('zlib' 'gcc-libs' 'boost-libs' 'intel-tbb')
-makedepends=('python2' 'python' 'boost' 'cmake' 'vim' 'help2man')
+makedepends=('python' 'boost' 'cmake' 'vim' 'help2man')
 # vim for xxd
-optdepends=('python2: python2 module'
-            'python: python module')
+optdepends=('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, python3, m4ri, libmysqlclient, valgrind
+# intel-tbb, python3, m4ri, libmysqlclient, valgrind
 
 prepare() {
   cd cryptominisat-$pkgver
-  sed -i 's/python$/python2/' python/Makefile
   sed -i 's/\(CRYPTOMINISAT4_EXECUTABLE\).*/\1 cryptominisat5\)/' *.cmake.in
 }
 
@@ -39,13 +37,7 @@
       -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
 }
 
@@ -55,11 +47,9 @@
 
   # smoke test
   ln -sf pycryptosat.so libcryptominisat5.so.5.6
-  PYTHONPATH=$_TESTPATH python2 -c "from pycryptosat import Solver"
   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
 }
 
@@ -70,7 +60,6 @@
   make install DESTDIR="$pkgdir"
   # 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}"
 }