Date: Tue, 24 Jul 2018 21:03:48 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475278 - in head/math: . py-z3-solver py-z3-solver/files z3 Message-ID: <201807242103.w6OL3m34075239@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Tue Jul 24 21:03:48 2018 New Revision: 475278 URL: https://svnweb.freebsd.org/changeset/ports/475278 Log: math/z3: Fix the python binding to work for all python versions The python binding is removed from math/z3 and placed into a separate port math/mpy-z3-solver that builds for all python versions. While here, remove the unnecessary CONFLICTS statement. PR: 229937 Approved by: portmgr Added: head/math/py-z3-solver/ head/math/py-z3-solver/Makefile (contents, props changed) head/math/py-z3-solver/distinfo (contents, props changed) head/math/py-z3-solver/files/ head/math/py-z3-solver/files/patch-setup.py (contents, props changed) head/math/py-z3-solver/pkg-descr (contents, props changed) Modified: head/math/Makefile head/math/z3/Makefile head/math/z3/pkg-plist Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Tue Jul 24 20:31:48 2018 (r475277) +++ head/math/Makefile Tue Jul 24 21:03:48 2018 (r475278) @@ -736,6 +736,7 @@ SUBDIR += py-uncertainties SUBDIR += py-viper SUBDIR += py-yt + SUBDIR += py-z3-solver SUBDIR += qalculate SUBDIR += qd SUBDIR += qhull Added: head/math/py-z3-solver/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-z3-solver/Makefile Tue Jul 24 21:03:48 2018 (r475278) @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= z3-solver +DISTVERSIONPREFIX= z3- +DISTVERSION= 4.7.1 +CATEGORIES= math +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Python binding for Z3 Theorem Prover + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/../../../LICENSE.txt + +# CAVEAT: It should have LIB_DEPENDS=libz3.so:math/z3, but currently it rebuilds all code, see https://github.com/Z3Prover/z3/issues/1767 + +USES= python +USE_GITHUB= yes +GH_ACCOUNT= Z3Prover +GH_PROJECT= z3 +USE_PYTHON= distutils autoplist + +WRKSRC_SUBDIR= src/api/python + +.include <bsd.port.mk> Added: head/math/py-z3-solver/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-z3-solver/distinfo Tue Jul 24 21:03:48 2018 (r475278) @@ -0,0 +1,3 @@ +TIMESTAMP = 1529241358 +SHA256 (Z3Prover-z3-z3-4.7.1_GH0.tar.gz) = a353e3da00cdaffd258052cc1406efc854606855222ab4bfd5679c58af5c11c7 +SIZE (Z3Prover-z3-z3-4.7.1_GH0.tar.gz) = 4015416 Added: head/math/py-z3-solver/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-z3-solver/files/patch-setup.py Tue Jul 24 21:03:48 2018 (r475278) @@ -0,0 +1,12 @@ +--- setup.py.orig 2018-07-21 19:34:29 UTC ++++ setup.py +@@ -161,9 +161,5 @@ setup( + keywords=['z3', 'smt', 'sat', 'prover', 'theorem'], + packages=['z3'], + include_package_data=True, +- package_data={ +- 'z3': [os.path.join('lib', '*'), os.path.join('include', '*.h'), os.path.join('include', 'c++', '*.h')] +- }, +- data_files=[('bin',[os.path.join('bin',EXECUTABLE_FILE)])], + cmdclass={'build': build, 'develop': develop, 'sdist': sdist, 'bdist_egg': bdist_egg}, + ) Added: head/math/py-z3-solver/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-z3-solver/pkg-descr Tue Jul 24 21:03:48 2018 (r475278) @@ -0,0 +1,4 @@ +Python binding for Z3, a high-performance theorem prover developed +at Microsoft Research. + +WWW: https://github.com/Z3Prover/z3 Modified: head/math/z3/Makefile ============================================================================== --- head/math/z3/Makefile Tue Jul 24 20:31:48 2018 (r475277) +++ head/math/z3/Makefile Tue Jul 24 21:03:48 2018 (r475278) @@ -3,6 +3,7 @@ PORTNAME= z3 DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 4.7.1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= arrowd@FreeBSD.org @@ -11,24 +12,16 @@ COMMENT= Z3 Theorem Prover LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -# compiler picks ${LOCALBASE}/include/dictionary.h from iniparser -CONFLICTS= iniparser-* - +USES= python:2.7,build USE_GITHUB= yes GH_ACCOUNT= Z3Prover -OPTIONS_DEFINE= DEBUG STATIC PYTHON GMP +OPTIONS_DEFINE= DEBUG STATIC GMP -OPTIONS_DEFAULT= STATIC PYTHON +OPTIONS_DEFAULT= STATIC OPTIONS_SUB= yes DEBUG_CONFIGURE_ON= --debug - -PYTHON_DESC= Enable python bindings -PYTHON_CONFIGURE_ON= --python -PYTHON_USES= python:2.7 -PYTHON_USES_OFF= python:2.7,build -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} STATIC_DESC= Build static z3 library STATIC_CONFIGURE_ON= --staticlib Modified: head/math/z3/pkg-plist ============================================================================== --- head/math/z3/pkg-plist Tue Jul 24 20:31:48 2018 (r475277) +++ head/math/z3/pkg-plist Tue Jul 24 21:03:48 2018 (r475278) @@ -16,24 +16,3 @@ include/z3_v1.h %%STATIC%%lib/libz3.a lib/libz3.so lib/libz3.so.0 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/__init__.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/lib/libz3.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3consts.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3consts.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3core.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3core.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3num.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3num.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3poly.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3poly.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3printer.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3printer.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3rcf.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3rcf.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3types.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3types.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3util.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/z3/z3util.pyc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807242103.w6OL3m34075239>