Attachment 195347 Details for Bug 229937 – patch

[patch] patch

z3-split-out-python.patch (text/plain), 5.75 KB, created by Yuri Victorovich on 2018-07-21 21:41:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2018-07-21 21:41:02 UTC

Size: 5.75 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 475056)
>+++ Makefile	(working copy)
>@@ -735,6 +735,7 @@
>     SUBDIR += py-uncertainties
>     SUBDIR += py-viper
>     SUBDIR += py-yt
>+    SUBDIR += py-z3
>     SUBDIR += qalculate
>     SUBDIR += qd
>     SUBDIR += qhull
>Index: z3/Makefile
>===================================================================
>--- z3/Makefile	(revision 474788)
>+++ z3/Makefile	(working copy)
>@@ -11,25 +11,17 @@
> 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
> 
>Index: z3/pkg-plist
>===================================================================
>--- z3/pkg-plist	(revision 474788)
>+++ z3/pkg-plist	(working copy)
>@@ -16,24 +16,3 @@
> %%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
>Index: py-z3/Makefile
>===================================================================
>--- py-z3/Makefile	(nonexistent)
>+++ py-z3/Makefile	(working copy)
>@@ -0,0 +1,24 @@
>+# $FreeBSD$
>+
>+PORTNAME=	z3
>+DISTVERSIONPREFIX=	${PORTNAME}-
>+DISTVERSION=	4.7.1
>+CATEGORIES=	math
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+
>+# CAVEAT: It should have LIB_DEPENDS=libz3.so:math/z3, but currently it rebuilds all the code, see https://github.com/Z3Prover/z3/issues/1767
>+
>+MAINTAINER=	arrowd@FreeBSD.org
>+COMMENT=	Python binding for Z3 Theorem Prover
>+
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/../../../LICENSE.txt
>+
>+USES=		python
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	Z3Prover
>+USE_PYTHON=	distutils autoplist
>+
>+WRKSRC_SUBDIR=	src/api/python
>+
>+.include <bsd.port.mk>
>
>Property changes on: py-z3/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: py-z3/distinfo
>===================================================================
>--- py-z3/distinfo	(nonexistent)
>+++ py-z3/distinfo	(working copy)
>@@ -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
>
>Property changes on: py-z3/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: py-z3/files/patch-setup.py
>===================================================================
>--- py-z3/files/patch-setup.py	(nonexistent)
>+++ py-z3/files/patch-setup.py	(working copy)
>@@ -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},
>+ )
>
>Property changes on: py-z3/files/patch-setup.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: py-z3/pkg-descr
>===================================================================
>--- py-z3/pkg-descr	(nonexistent)
>+++ py-z3/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+Python binding for Z3, a high-performance theorem prover developed
>+at Microsoft Research.
>+
>+WWW: https://github.com/Z3Prover/z3
>
>Property changes on: py-z3/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 229937: 195347 | 195355 | 195356